Merge "Scoped directory access api is not supported on ATV." am: f72f17e6a3
am: 47bf669136

Change-Id: I1d914cf3922ad3240a8f751d5cd61661372f2bc3