[automerger skipped] Modified existing SliceQuery functions and added some new ones. am: 7cc06964ed am: 4c6780ccc7
am: 72920fd151 -s ours
am skip reason: change_id Ia6f58e62e77ae3625fcf6bc2724f529cc8c58d27 with SHA1 a1ca2a9b16 is in history

Change-Id: I1f12460326e55f74b7904c8c351ece370d5ee5f0