Merge "Allow the system user to read apex_data_file." am: 6cc741ec9a
am: 54c3f13487

Change-Id: I10ae0ca66bc4ddc3376b132a777035e061782ec1