Merge "Remove service death test." am: 42542b5715 am: d2ac5c416c

Change-Id: I6f27990c868703d7c5eded1fecc49c7e60ab375d