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

Change-Id: I46f86f7c166ebf91723675467847d2ff472164b2