Merge changes from topic "am-6f0d1125-8060-4e8b-afe5-8e18597ac90b" into oc-dev am: ee97cf22ba
am: ceb2e462f8

Change-Id: I1d0313a868fd0083b78994912746f1fbe5acf714