Change-Id: Ie87d2ef68050a402d6c81ca98cc7402f7c5f14aa Follows-Up: Ic3a434c061ed6e443ea072bc62dda09acbeeed7f
comment
A subsequent patch will remove the old columns. Bug: T166732 Change-Id: Ic3a434c061ed6e443ea072bc62dda09acbeeed7f