Merge "ShellSubscriber: Avoid rollover bug" into rvc-dev am: f1d96d48 am: 2f552669 am: cc02f9b5 am: 74597929 Change-Id: Id20ebd4a7ad37705f547e0f6e203ca60b2ad61ae