am bf5b176b: (-s ours) am c985363a: am b45af1bf: (-s ours) Merge "DO NOT MERGE Filter out the overdue location cases in GPS test" into jb-dev * commit 'bf5b176b': DO NOT MERGE Filter out the overdue location cases in GPS test