Insert nulls for missing data

Otherwise our db_insert placeholders are off by some.

Change-Id: I4d3bf807108fb5c96e26acde0084181df3448be8
Merge remote-tracking branch 'origin/master' into HEAD

38bd81aa7a77408dfe6d016b4f4a7d87aa0cebd3 Insert nulls for missing data

Change-Id: I8762f8a49fb36e91cbe5e2087f1ca9ae06f3866f