Merge changes from topic "am-fbac9b0f-ad7d-4426-aa8e-d258fe8d9560" into oc-dev am: 9b4f5525b4 am: dededea9f3
am: 5e66879b53

Change-Id: Ib02ca4cd840e86f0287c5b02f45419b894f044ea