Merge "Add wait_for_keymaster"