am a2b69f9b: am 125cc194: Merge "Add dependency on the 22.0 plugin."

* commit 'a2b69f9b7356bc4723aff784216496230f3ef7e1':
  Add dependency on the 22.0 plugin.