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

Change-Id: Ifeab0174b98a7755f246966e6e689d46cdbacdbc