Merge "Avoid crash when ANDROID_DATA is not writeable."
am: 2ea7c19a13

Change-Id: I408ae2c43de8dcf965fa14a9f85f498e11ffcb69