Merge changes from topic "am-da3e9584-98c5-4975-8207-a77d2301579a" into oc-dev am: bd9caf4c am: 2b605d89 am: 64c1873c Change-Id: Ie4a67f372f3a7d187a7c7fe9c5d364c460535376