Merge "Remove wait_for_keymaster and all references"