Merge "Add support for wait-on-handlers command."
am: da6d683caa

Change-Id: I71bee35ec1bf6ff4100f6515ea87dcc89312a689