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

Change-Id: I9338e3fc03df0524870006acc9dbabe8684aeda7