Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge" am: c710cf28ff am: 87b8d43035

Original change: undetermined

Change-Id: I5d3f9fcb2e4936d14241dcdcb778cc5442d82c1c