Merge "Add source in init action info logging." am: 26945e3f35
am: b5100180a5

Change-Id: Ia95a473e3ca454bdaf175299e802f1b63d5aff07