DO NOT MERGE - Fixes account_* URI handling in BP2

 Cherry pick from master

 Bug: 3329654
 Changes the handling of account_* URI parameters to allow requests
 to distinguish between no account_* filtering and filter to the
 default account.

Change-Id: Ic633d2dcb4c04d51aabffb504a57f08f83de08cb
6 files changed