[automerger skipped] Merge "Treating all FileSection files as device specific." am: db2353c143 am: 7574d15603 -s ours am: 81104585f4 -s ours
am: 57ebdebf84 -s ours
am skip reason: change_id Ief09427f08d18aee611d057ddafdb9a3466744db with SHA1 e04ef777c1 is in history

Change-Id: I527fc56f08dda4d1ae73c8e3bbc0c1927af3947e