Merge upstream-master

Bug: 158130138
Change-Id: If6da1b0e2dadc24e151e5a76845ba6bf979a4375