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

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

Change-Id: Ibc5d257ae65baec7a9ff525b17f2042c069a5b11