Merge changes I9da985a7,I2bd642aa,I9358b3c9,I9d3c60b1 into oc-dev am: 62dc1344e0
am: a9ece3a74e

Change-Id: I571d9f2fac7328ff50f58539050414fe7b013d8b