Merge changes from topic "am-d8363787-88bb-4e45-b57c-b18d9d8290cb" into oc-dev am: f7bdc8fd87
am: 24fba8cf55

Change-Id: I77568438ff1c7b548256488f88f0291ab5780fd3