Merge changes from topic "am-6ebe6f88-baa6-4992-847e-cbad0be1c6a5" into oc-dev am: 339d408f56
am: 730a8e1c75

Change-Id: I5945a827a39db6391c6e5fbdbcedfa8c6f618989