Merge changes from topic "am-6ebe6f88-baa6-4992-847e-cbad0be1c6a5" into oc-dev am: 339d408f56 am: 730a8e1c75
am: 120674913e

Change-Id: Ifc7199f780953b212d970dc780c0c501d06d4530