Merge changes from topic "am-7afd78fd-5487-49f9-97ec-191b4e3e1853" into oc-dev am: e0fa9e2cc5 am: 97e0da1fd0 am: 10f246d0c1
am: 9d6f30dc4f

Change-Id: Id7e70bbb0f8e97b4f7015fc6c7cd6a005673b700