Merge "allow priv_apps to read from incremental_control_file"