Merge "Resume-on-Reboot: change SystemApi calls slightly" into rvc-dev