Merge "Revert^2 "Avoid crash when ANDROID_DATA is not writeable.""
am: 70bd78d992

Change-Id: I899662344674420e298603099b70c9ff9a86f82a