Merge branch 'merge-gobi-cromo-plugin-rewrite' into merge-gobi-cromo-plugin

BUG=chromium:388278

Change-Id: Ia640dbfa5aa7928df205d676571eaee461bbc544