Merge changes from topic "am-ef8b8c56c2ad450fb6fab355f35597b0" into oc-dev am: 4839fb4a am: beef47bf am: 3da59c59 Change-Id: I8f114ec9baea79623dce7f211571fcc8ddf56174