Merge changes from topic "am-99626481-1222-4690-a6c3-4a3db61755f9" into oc-dev am: eedc6cb657
am: d9f8d9181a

Change-Id: I1d10926666edae08ee5376ffb08e6bd8362b540e