Merge "DO NOT MERGE - Merge PPRL.190405.003 into stage-aosp-master" into stage-aosp-master