Merge "Minor tweaks on Scoped Directory Access:" into nyc-dev
am: d847b51

* commit 'd847b511d3828fa6cb7a740ecd8876f16524f684':
  Minor tweaks on Scoped Directory Access:

Change-Id: I27a0c909600ec42e6f7570c0cd7b528d1619233f