Update formatting of externalstore classes

Change-Id: Ie31c370ba497eedc7458973b704132cf4725cf1f