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