Allow container_directories to have non-standard permissions

Change-Id: I40b0052876078c3472e88594a5c0d7e039b9817a