Merge "Add wait_for_keymaster" into pi-dev