Fix editing of ranks

Bug: 73307
Change-Id: I9e48cc31b95b4f4a5fc1a81be669064f49bcd9c0
(cherry picked from commit 555dfa378210e72d7aba8490f9449c3c41e3ed38)