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

Change-Id: I67c04d480471f5fc1cc61d3a6a962a440aeced92