Change-Id: Id26b4ff357da29ba8926305b3dc1c8a5105c704c
Bug 1690453 is a duplicate of bug 1687488 so this updates the query. Change-Id: I9e579d942439c50cb32417d21e6f921ebf477ade