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

Change-Id: I90831dc3ece70cad0c4ea515ae0441bcaaa5f895