Merge remote-tracking branch 'cros/master' into uprev am: 0323debe2d
am: 5505d71f92

Change-Id: Ic47002a08300051d732025e95f3927499338830c