Merge "Fix flaky important people sort test" into rvc-dev am: 8faccab8 am: 51b35a4f am: d9b45289 Change-Id: Iab75792ba3c5ab878ea1897cf7acc40bf15abb66