Merge "AutoSize TextView - fix measurements" into oc-dev am: e812e7dc2e
am: de8aec39bf

Change-Id: I582265f2e0c19118a3759e4348fd693df26ac905