Merge changes from topic "am-526d0729-217b-4043-bfd1-c28db41e03e6" into oc-dev am: 91778f9d0c
am: d75415e0a6

Change-Id: I3ca161e90e3f21d6bc30eadbae13347742747610