Merge "Temporarily include platform_compat service dump in failure logs." into udc-dev