Merge "Fixed a bug with decorated custom views" into oc-mr1-dev
am: 9d41e8cd47

Change-Id: I36099788ad09bb8035374c2ca27caffabc21dfb0