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

Change-Id: I1cf9609fee6d19a219a8e1a64d44c161dd9025b3