Merge "Fix USAGE_FRONT_BUFFER failure on Cuttlefish" into udc-dev