Merge "Fix SDK build broken by ag/423985"