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

Change-Id: I605026459c929fc2aa7d82b376ebd059c5b95441