Merge changes from topic "am-5969704d-c4c1-4e63-afae-e851b95f3e2b" into oc-dev am: 5ee2efb484 am: 340620b4cb am: 68670c2f77
am: ecb38f300b

Change-Id: Ide927dc31a138a3ac9cacf52637a5ac413251b6c