resolve merge conflicts of 2e21f8d8cbbe to oc-dev-plus-aosp

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I9c6e9a52e67a06c16b6c8fb6f8eb4647b2fec508