Merge changes from topic "am-79da5bca-0ca6-42a8-8b95-7ab98d864152" into oc-dev am: 48dcdf9a78
am: 448b966b7a

Change-Id: I8bfef4e2a056761a53224985f47cad9f502ad9de