Merge "Restore the appropriate SELinux context to the downloads dir." into jb-mr2-dev