Merge "Process file_contexts in the same order as specified"
am: 4a9cbc7a4f

Change-Id: Icbdfef1d69aa52010e3514cbacac21f8a12214de