Merge changes from topic "am-5969704d-c4c1-4e63-afae-e851b95f3e2b" into oc-dev am: 5ee2efb484 am: 340620b4cb
am: 68670c2f77

Change-Id: I24b7efa297ae908de669cb6957071003c037fca4