Merge "Add Simulator service."
am: 336cc00d41

Change-Id: Idabdb6072fd3887a4dcfd1b1a0b4f944bbe8a17b