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

Change-Id: I3eb8510d547ce20d2fff82028ff87ba3a45a294a