Merge changes from topic "am-646cf556-d36a-48f1-a414-3797586a8a96" into oc-dev am: ea5a5f49cc
am: 5897727afc

Change-Id: I9fa868feb79839c8090ba44901c09602d48a00d9