Merge remote-tracking branch 'cros/master' into 'cros/release-R21-2465.B'

Change-Id: I4bdc18f091de8d1f6603d15e92153c1781eea055