(FR #1249) Make schema match production

Change-Id: Ia2ad7edc745ae050b2b47a15984e328c3f22b28f
Merge "(FR #1249) Make schema match production"