Merge changes from topic "am-8df3bdfc-9f3c-40b2-b051-5cc0120da88b" into oc-dev am: eb9a92f9 am: 93931331 am: 6a423ee7 Change-Id: Ifeab0174b98a7755f246966e6e689d46cdbacdbc