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

Change-Id: Idf086e4237138dccbf30e74f489a56b91c24fd3c