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

Change-Id: I446c693cfd86954f789db4fbc6d11d6954c6d343