resolve merge conflicts of 99d2e72 to stage-aosp-master

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