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

Change-Id: I94c7b1d7e9bda726390fc5ceba62f8286a06bc42