Merge changes from topic "am-c65d7988-0ca0-4757-9d9c-21f4575eec01" into oc-dev am: 515700b4fe am: c93b474752
am: b9504e591a

Change-Id: I2b24a15f259b6c587e9bfc4fa01b4a8aa888f75a