Shield mobileID and wifi mac (2/3)

Change-Id: I0e5f0dc8043eab8843d2e34ef97f2177928cbcd4