am aa7cc1e2: Merge "Adding idle maintenance service."

* commit 'aa7cc1e2ab9856e9c57c1664020df60afaae3d72':
  Adding idle maintenance service.