Merge changes from topic "am-646cf556-d36a-48f1-a414-3797586a8a96" into oc-dev
am: ea5a5f49cc

Change-Id: Ib4683b9918a30e45b255e03b5dc5b38567b0bbe9