Merge "Fix CustomDescription so it allows multiple transformations per view id." into oc-mr1-dev am: d836c4f8a5
am: 1c3baee7e4

Change-Id: I363dda0f4c81558f717a39c375e073c4b594d1d5