combine db migration 1c10e575800c into 3fc28d7eb6d3

... to avoid two sets of ALTER TABLE statements on the log_* tables.

Bug: 1163540
Change-Id: Ieec8014ab397206c649eef12271ecbdc4b2f2385