Merge remote-tracking branch 'aosp/upstream-master' into desugar am: 28068806fa am: 6b2f3e8f0f
am: 970766bc54

Change-Id: I64daa5e6eb1809f2f67a49f78dbc491610d84eb5