Merge remote-tracking branch 'aosp/upstream-master' into update am: 19766b680b
am: abd220c53b

Change-Id: I1a1b6274863b4c627219f8e0482e7af3e0b8048e