Merge \"Fix permissions for /data/preloads\" into nyc-mr1-dev
am: 1faf57bf0b

Change-Id: I6fb7344f1c1308634a1e18c5944f811408b1dd2c