Merge "AutoSize TextView - fix transformation method" into oc-mr1-dev am: 8719c2a8e6
am: 45d18e2834

Change-Id: Ie161f8b1065791c1523f981a955561d810417097