Fixes for client package check  (#13111).

Change-Id: I3add0ceccec019efa11f249a811d3d1e07cb7094