Adding MRU support

Change-Id: I475cf299e6cb1f262cdd4bd8acb128ba2ccdc9c9