Merge changes from topic "am-8bf63f1b-ab99-4537-ad90-d648a4dd77b0" into oc-dev
am: c70d882667

Change-Id: I12e4db4d4d67cac9aa22f9c3fab1d141f29eb54b