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

Change-Id: Ie9c1894868034f923c684fbc8f33621ac1840820