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

Change-Id: Iff1c2fa5c05b891ea478caa2400cbd42f8a1914b