Merge changes from topic "am-9f47cb6c-9cea-4b25-9f9b-e0e460e471ac" into oc-dev
am: 71bd839856

Change-Id: Ic7c05906f4d2f9fecc9ab93ab90b9869d8b176be