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

Change-Id: I68fc2af18574e26602fad50e6dedd969dc48e948