Sync extensions with Gerrit

Change-Id: Ifd95d558a632f3f8aa10f869254645380e699948
Merge "Sync extensions with Gerrit"