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

Change-Id: I82bf42d99e63637d10788c53309bd4dc758ebcbb