Merge "Add interfaces required by smart idle maintenance service"