Merge "Add system_file_type" am: d14b18d80e
am: 956e842405

Change-Id: I15ab70cd9db254b9d60fa7f176e1443f3902638c