Merge remote-tracking branch 'upstream/master' into HEAD

Change-Id: Id6a3b503a992a73bfa5e0fcd2260aebd1ba82562