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

Change-Id: I45bf692feecb627cc470e0c1577fbf26aefd9d48