Merge changes from topic "am-662f3e36-36cc-485d-824b-f28c01eea384" into oc-dev am: 0cda123801 am: 427aebe54a
am: 20b2bc080e

Change-Id: I3662266f41058a194921afe9126dfbbd0b9c8b52