Merge changes I8ae4e331,Id4e37c3e,If0fd4834 into oc-dev am: e422bc0c am: 43d5e3bb am: 929c2c5e Change-Id: I59ffea6df5c62eb899b3603c8767318e96af195a