Fix editing of ranks

Bug: 73307
Change-Id: I9e48cc31b95b4f4a5fc1a81be669064f49bcd9c0
Merge "Fix editing of ranks"