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

Change-Id: I526df7dbc1ac8e7de1797f9f74b65250621263e9