Merge "Add plugin to swap out recents" into oc-dr1-dev
am: a69c03b6b1

Change-Id: Ie662871b2c251444bf6927280053d3705a11337d