am ddf1f024: Merge "Update internal plugin."

* commit 'ddf1f0244bf3af14cb8239a5384a9000c425eb51':
  Update internal plugin.