Merge "DO NOT MERGE Filter out the overdue location cases in GPS test" into jb-dev