am 84ed482f: am 1c252a6f: Merge "Fix default attributes in ScaleDrawable" into...
am 84ed482f: am 1c252a6f: Merge "Fix default attributes in ScaleDrawable" into lmp-mr1-dev automerge: 26478bad
* commit '84ed482f':
Fix default attributes in ScaleDrawable