DO NOT MERGE - Port 2D recents implementation from master to nyc-mr2
am: bf8e290376

Change-Id: I7b05418dc2d03da33e862cf67dbcd1d08cb1b899