Merge "AutoSize TextView - major fixes" into oc-dev
am: b34c9d3a33

Change-Id: Iec698f291365adf367dd318eaf2d0752f109e82c