Merge 'aosp/upstream-master' into 'aosp/master' am: 01b2926cf7

Change-Id: Ib55889bc29919cf571406f1e1563fa0c34c7bbf7