Merge changes from topic "am-f4faa2c1-7416-4076-9f85-b0cd734dba65" into oc-dev
am: 58f5458e2e

Change-Id: I4bbb93c3f1585a0e7f07ab2cedcc2459e972c5c2