[automerger skipped] Merge changes I8ae4e331,Id4e37c3e,If0fd4834 into oc-dev...

[automerger skipped] Merge changes I8ae4e331,Id4e37c3e,If0fd4834 into oc-dev am: e422bc0c am: 43d5e3bb am: 929c2c5e am: 0cf08952 -s ours am: 9ecc8ab3 -s ours am: f3be8125 -s ours
am skip reason: Change-Id I8ae4e331d09b4734c54cdc6887b273705dce88b1 with SHA-1 bf04ea6d is in history

Change-Id: I801e2c9ab42e79b170aaabed834614fa639e6a37