mms auto retreival

Change-Id: I22159802f6bf403502dc1a625851eacbbcce1cb0
revert last commit

Change-Id: I07899070d8b4af1968276875beb324f1d06086f7
fix typo

Change-Id: Ia62b2639b3ffa9e4b050ffa7c767b5531a3216ed