[automerger skipped] resolve merge conflicts of...

[automerger skipped] resolve merge conflicts of 88c651ea to oc-dr1-dev am: 2bb3845d -s ours am: ff797c3b -s ours am: b868794d -s ours am: 0329c19d -s ours am: c903d9cf -s ours
am: 6e7337a1 -s ours
am skip reason: change_id I0680034ed9315aa2c05282524d48faaed066ebd0 with SHA1 5136eefe is in history

Change-Id: I3a87635163a61fea0fa9e176ee0d11b766b5a0fe