Merge "Use decode instead of parseLong for query params." am: baeedfee am: ab0c1761 am: afa1df47 am: 4b624b8d Change-Id: If0ef1787b97e9d42684a635680555cef7fb1aad8