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

Original change: undetermined

Change-Id: I33094239add68a51ab5eadea3c952e2857d0e946