Merge "Fix a bug where the package stats query timeout may crash." into nyc-mr2-dev
am: dfe1bc2f34

Change-Id: I1c06fad6316f3cc34b917cbbf359d838e01d650e