Merge changes from topic "am-646f2b08-34bd-411a-990e-eb87fb67f9e3" into oc-dev
am: 8203c5323d

Change-Id: I33eefb209bdc2ed5a8135c54faa2f322f24b95d2