Merge changes from topic "am-50f2664b-3d8d-4221-b41f-06e7bfaa8365" into oc-dev
am: c99fc3e1dc

Change-Id: I2c7eb4a9fa7d6118ab1d8dbb2b17abc5c9a2211a