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

Change-Id: I149351dee948b64a4ee4de1512ea98d7692afdf6