sdcardfs diff from 3.4

Change-Id: Idf07cb6b42c3e81c067ec3697835db74afe90c56