Merge "Fixed broken ImageFloatingTextViewTests" into oc-dev
am: 76926df97e

Change-Id: I7183050c98b5f1eb9f8a8a7dbfe4b7b75a1c3be7