DO NOT MERGE Add stop method to backup handler thread. am: 842369a82b
am: 0bae181e71

Change-Id: I40ab5b18027d120a05af2e68d4bce09df895a901