Merge changes from topic "am-100638f4-8d58-47a0-b84b-5e3b7006a2a7" into oc-dev
am: b6ac1f11dd

Change-Id: Id4edf477122ed31cc43de56487e1e694dede52c7