Merge changes from topic "am-8dbc037c-490f-442d-957b-fea681fe1136" into oc-dev am: dd05e2d932 am: ea5b2a818d am: 5b8e6195a0
am: 154ba3eab6

Change-Id: I3ac71e5c857402e87742919feb827b44927b5e3e