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

Change-Id: I74050b50b46591d06d652f8a4b3a9701e5ce8038