Update to ADT 22
Merge commit 'c29048666323ba9eed9c1e16e4a0cb8c75065814'