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

Change-Id: I5bb0e7dd6712316f0e349795fb9d607a7bc92b9c