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

Change-Id: I91899094a4798d83b8e2e24b41d5f11a3a9bb045