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

Change-Id: Idd61b7263449df6c1aca8d6f1347fb17821cea3f