Merge changes from topic "am-8b39bc05-db76-4bf1-8fe8-c3ba9936ccd0" into oc-dev am: d8c4b3a76d
am: 0dc362f4d9

Change-Id: I6095f68185a4be946914c6f0bf688a1c524393db