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

Change-Id: Ia8412a36bfb78752ead1a56b5391d30d9691ed22