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

Change-Id: I5cfc94bc9781c29a423a95a43d775e6bea6271b7