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

Change-Id: I9e325f6ab735b9c8d3fa13b661eb50874a6d7f69