Mms auto-retrieval 3/3
Signed-off-by: scotthartbti <scott.hart.bti@gmail.com>

Change-Id: I0332beccd61d4942c6acb03b434cbebbce39eb80