am 6714e677: Merge "Ninepatch tweaks for better interop"

* commit '6714e6774063aae7a8a7a80c36c89ec60170cb27':
  Ninepatch tweaks for better interop