Merge "Correct misleading javadoc for BackupHelper" into lmp-dev