Merge "Ensure the intent firewall dir exists before starting the FileObserver" into jb-mr2-dev