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

Change-Id: I2ad28e6a718946be431fcda0cbb8efa719b46db3