Merge "Extend white-listed directories to include /mnt/expand"
am: 3fb5f13806

* commit '3fb5f1380671b6b9d3b511fc2b80051a14313dec':
  Extend white-listed directories to include /mnt/expand

Change-Id: I106dac170a9acb80835082916e6aa09328e5fb11