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

Change-Id: I3dda600d61712ce07211fd5d4372f335fe6f34c5