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

Change-Id: Id3fd43caf91de165169d1b3f2af2f1218c658d8d