Merge "Properly clear adapter service in DipTest"
tree: 13cdd78ceeaeb955542350bdbcd203e4d539cb8d
  1. android/