am 0a449fe2: am da05f33c: am eb116b72: am 56ce8f8a: am 30bbb8e7: am e93a70a6: Merge "Fix failing TextViewTest#testTextAttr " into lmp-sprout-dev

* commit '0a449fe2397da31d77345fc44c095a0b97d2037a':