Merge "Relay extras from sorted cursor." into nyc-andromeda-dev
am: e2cd3ccaf9

Change-Id: I92d88ae34b9b814fbd763eb73f693e5dfc835315