Merge changes from topic "am-2bdda567-72b2-4e25-9a99-dfd3ec839928" into oc-mr1-dev am: 38b7eabb2e
am: dcd415607b

Change-Id: Id77b14ecbe931463abf2458dd943005a935add26