Fix "No file_contexts" warning am: e35926e1af am: eba11fa574
am: 29476681cb

Change-Id: Ib8f7981adf3455af83ac28481bb109d9d924e900