Merge "b/2336411 Added check to ensure cursor is not empty."