Merge changes from topic "am-00ffb4de-7aa5-42a4-ba5d-b45278438ff9" into oc-dev
am: 283b2bdbd9

Change-Id: I7d0effdf9aaa5dcc15e42572cdff014cf009f550