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

Change-Id: Idde9abe8b5c7bd6fadc3ebf82863e216af130c9e