Merge "Addresses TODO in ResumeOnRebootService Javadoc"