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

Change-Id: I9fbe73d56cc345972ba327afe41865af3b57ff63