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