Register two more extensions

Change-Id: I0d681a9fa1d525308fbaa6bc463da6a12fe290af
Merge "Register two more extensions"