Merge changes from topic "am-81126cf1-3777-4130-82b2-fbb9b5f9bcf8" into oc-dev am: 7c3c200380
am: 5ab6f8bee4

Change-Id: Ib0d9eb0e2a99447016deb2ba6e9d247e62038ba1