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

Change-Id: I7f248dcf2f43ce385ba243469d8c6c23c035edad