Merge changes from topic "am-3d7d15cb-f02b-474d-adb3-adb7e033539e" into oc-dev
am: 11eddd5a22

Change-Id: Iabc41876ce5fd26e5383586d76f5f4c9b920b055