Merge changes from topic "am-f1c23412-1f54-4840-90d6-b3eb7b06fc83" into oc-dev am: 59f13cbb am: 34d73a6f am: 331b1882 Change-Id: Ie7c5f82c79e8844493bd6dc203f294bc0d645150