Merge remote-tracking branch 'cros/master' into uprev am: ced4ae2804 am: 3531809f66
am: c594b088ec

Change-Id: I6a4dcdb824b7e987bc45bc14b28f4131eb841ba5