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

Change-Id: I9b544c70edf909ad82edf45207286168e63ffcd6