sync extensions

Change-Id: I6909538fdb7c2bfbbabf3994dc179c85ac4ba9f1
Merge "sync extensions"