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

* commit '8f79183a11200edcc73dc39fdfdf691892094fe5':
  Extend white-listed directories to include /mnt/expand

Change-Id: I180824317f10dba42a7535667afb7744522f214d