Merge changes from topic "am-8acf63d1-cfe0-4950-98c3-1d2367987749" into oc-dev
am: 000036eb4c

Change-Id: Ic71e3f93036902b2d9452c05e7cdb6e4df2fb0e0