Merge remote-tracking branch 'upstream/master' into merge
am: 3bbc581d99

Change-Id: I976aefa9ce61d3b6fc48f9730caf80113c3b98d9