Merge "Add tap target for when udfps is unavailable"