Merge changes from topic "am-896be361-a4b1-43e7-b1d4-8f471894d3a2" into oc-dev am: d5ea04a874 am: 816c77b132 am: 050cdecc47
am: 6babcab565

Change-Id: If0a9bf2aff17429f784640b970ceb0b19e7d588f