Merge "Skip logging the warning for uncrypt_status for devices w/o /cache" am: df0619edea  -s ours am: a97b0712d8  -s ours
am: 334850c9fe  -s ours

Change-Id: I3a6ab2167920e16d29e9e90fa2726b2df97c6973