Merge "Addresses TODO in ResumeOnRebootService Javadoc" into sc-dev