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

Change-Id: I80669c442c53a49687974851dccf0c9c9b500e96