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

Change-Id: I33a3cbfa55b209530b95d83ce90c0b7660ff9414