Merge "Keep the same row order during upgrade" am: ce3cd2afe0 am: bb6f538564
am: fabbefb671

Change-Id: I174eea99c90d2853e870027337b31643952b42a6