Merge \\"Fix sdcard logging.\\" am: 47b077a44f
am: 60b896c438

Change-Id: Ib22a4d84395378196ca191b36e3a17897360708d