Merge "bug:3264401 changes to support usage of new downloads dir in /data"