Sdcard and wifi changes

Change-Id: I9e21a876f2a8d32b8ff1344e04703da4ad7586ce