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

Change-Id: I21ad151333ac9582951cefa822727b53be747eec