resolve merge conflicts of 2ee069f73d2e9f978fd79b1c779930654d7f074b to stage-aosp-master

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Merged-In: Ia79256a3d04e16dd78331a61af0dcddc5fc1599b
Change-Id: Ieb9836ae90f6f2565fa3ba5c395b42069b58ff71