Merge "Update Java doc for ResumeOnReboot"