Merge changes from topic "am-1c138342-1998-40bb-ba55-f770981081f6" into oc-dev am: debe58e1e4 am: 7c68d4d663 am: dfac678756
am: 4dff7dddcf

Change-Id: I289ed5e2128dd5c5b20ae8ac6c4762c860833895