DO NOT MERGE - Merge QQ2A.200305.003 into stage-aosp-master

Bug: 150410372
Change-Id: I74f5f8e58d781dfaebd01e54db76e01c657ab525