Merge "Use decode instead of parseLong for query params."
am: baeedfee35

Change-Id: Ic606b8af6d88b57512168fc23783604cdc8caede