Merge branch 'merge-libchromeos-rewrite' into merge-libchromeos

BUG=chromium:370258

Change-Id: Ie4ff2b1976ac7bacf77d13542fea17b3e8efdabf