Merge "Keep /mnt/secure private to default namespace." into jb-mr1-dev