Merge "Add Simulator service." am: 336cc00d41 am: 7a93d7c337
am: d9097895e6

Change-Id: I36a97c3e1e962906866f7cd8cb3995acb8dd2ba7