Merge changes from topic "am-8df3bdfc-9f3c-40b2-b051-5cc0120da88b" into oc-dev am: eb9a92f942 am: 939313310b am: 6a423ee7ce
am: 91de2d1cd0

Change-Id: Ie7981e0c2396db68892f95605c9d5b0107f8d0de