Merge "DO NOT MERGE - Port 2D recents implementation from master to nyc-mr2" into nyc-mr2-dev am: 5ef12f244c
am: 842b596000  -s ours

Change-Id: I5346c09b3fb8212ea72014a00ddce644449b9553