Fix i18n of string templates.

Change-Id: I4ed11b43b8b1072094bd2b6f88687900c858bafe
Sync base identity Driver defs with SQL driver

Change-Id: Id20c1167dbc718ba4bd8cb0df88edd2bc922c3c6
Merge "Fix i18n of string templates."
Merge "Sync base identity Driver defs with SQL driver"