am 885a301b: am 4a534e00: Merge "Delete BrowserTestPlugin." into klp-dev

* commit '885a301b65cb33f2d6c65c4d9e7d43714ffd5db4':
  Delete BrowserTestPlugin.