Merge "Treating all FileSection files as device specific."
am: db2353c143

Change-Id: Ifc8d046ada24e83b6f68d56747e96c3d2db6f3e8