Recompile templates from master

Change-Id: I7f495235be0f5b5ce716cf70c0c74ea505c51e0d
Merge "Recompile templates from master"