Merge changes from topic "am-8dbc037c-490f-442d-957b-fea681fe1136" into oc-dev am: dd05e2d932 am: ea5b2a818d
am: 5b8e6195a0

Change-Id: I34e8850eaa89f769957fa5b17f4d5cc823871292