Merge changes I8ae4e331,Id4e37c3e,If0fd4834 into oc-dev am: e422bc0c8f

Change-Id: I7efbfda4517e46abf406fd53487836704a941a2e