Merge changes from topic "am-491d8213-3eca-4563-937d-c6f23dd5f887" into oc-dev
am: 4244190788

Change-Id: Id4563c2be11b532bdbd1b504b4a83734eed58708