Merge "add locallog for carrier config loader"
am: b89eaefa51

Change-Id: I9485c1d78f0becc5e7f6f90511116f85b19def5c