Merge "Using transformation method in the ImageFloatingTextView" into oc-dr1-dev
am: 997e4ac2bb

Change-Id: Ifffc5f1dfe2a5d606e5eae128cbe0a331d4aaf7c