Merge changes from topic "am-81126cf1-3777-4130-82b2-fbb9b5f9bcf8" into oc-dev am: 7c3c2003 am: 5ab6f8be am: 48b0bdb8 Change-Id: I82854adeda1255f13bf04091b69a518dfdc85a05