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

Change-Id: I7e3685186f6a2049905e3f77ca69250f17a3cd0e