[automerger skipped] resolve merge conflicts of...

[automerger skipped] resolve merge conflicts of 9c46de64 to oc-dr1-dev am: 662da964 -s ours am: f81fd097 am: 0f11c342 am: f8b5d242 am: ef7230a6 am: 5b2e74dc

Change-Id: I9f4b081ef02f830bf90b6d156bcdd105b8485446