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

Change-Id: I7f444ed85aad3b0eedcab0d537d3e18340d5a506