Merge changes from topic "am-662f3e36-36cc-485d-824b-f28c01eea384" into oc-dev am: 0cda1238 am: 427aebe5 am: 20b2bc08 Change-Id: I3662266f41058a194921afe9126dfbbd0b9c8b52