Merge "Revert query handling of subid"
am: 2e1c70e89b

Change-Id: I8c0875c5d7df0132366729509107e576e2ac9241