resolve merge conflicts of 58fc59b91c to oc-mr1-dev-plus-aosp

Test: I solemnly swear I tested this conflict resolution.
Exempt-From-Owner-Approval: weekend merge conflict resolution
Change-Id: I70002ccad145f7b5fa4854d6aa192322b07849e9