[automerger skipped] Merge changes I8ae4e331,Id4e37c3e,If0fd4834 into oc-dev am: e422bc0c8f am: 43d5e3bb62 am: 929c2c5e1b am: 0cf089521a -s ours
am skip reason: Change-Id I8ae4e331d09b4734c54cdc6887b273705dce88b1 with SHA-1 bf04ea6d3b is in history

Change-Id: I8dd0a9c26382b390dd7417fe35820abce79fdb92