am 84ed482f: am 1c252a6f: Merge "Fix default attributes in ScaleDrawable" into lmp-mr1-dev automerge: 26478ba

* commit '84ed482ff9a9e8f6ea6e14c978d4311f23396bc6':
  Fix default attributes in ScaleDrawable