resolve merge conflicts of 9c46de64 to oc-dr1-dev

Bug: 140181188
Bug: 140180629
Bug: 140182003
Test: I solemnly swear I tested this conflict resolution.
Merged-In: Iad8c3d1d74d8591a75a4c033c8bf9d3956d2fe4f
Change-Id: I8c64562a64f54ea000473a8f2d887f26df81812c