[automerger skipped] Keep the same row order during upgrade
am: 85b29a6a4f  -s ours

Change-Id: Ia2da87414a468ade4342cdc37c590272a68f6e82