Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into oc-dev am: d05a3078fc am: 0d2044af4b am: f1ff948671
am: 8fb67cb883

Change-Id: Ica58c7112b460e39f8b469201a054a420f04c35d