Merge "b/5317367 Check if cursor is empty before reading"