am 89fe584f: (-s ours) am 5d9f9a41: (-s ours) am f39645cc: DO NOT MERGE: Work around framework bug related to service start

* commit '89fe584fbf1376d82db4daa0f427b085b2204bfb':
  DO NOT MERGE: Work around framework bug related to service start