Rewrite subquery to make better use of indexes

Bug:4021462

Change-Id: If14d2c6b2e3a57c27bf16387295d45d23df52465
1 file changed