Merge changes I5d41419a,I763be06c into oc-dev
am: bc4bd823d9

Change-Id: I1c23329a3a18fb58d42c13e91e030f589e19025b