Merge "AutoSize TextView - correct pixel transformations" into oc-dev am: 98891dbb70
am: 9d26cc1129

Change-Id: I09779c5ed7a5161a8396f13a6d8a6af16aaf7cfc