Shield mobileID and wifi mac (3/3)

Change-Id: Ifef1f98eba63a47b59614c062fe99f526da40b1d