Merge "Transforming all texts of decorated media custom views" into oc-mr1-dev
am: 60a09546c0

Change-Id: If41351abbd54b19dbdcaecca01fe7104176f488b