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

Change-Id: I3f7aca4512b3b0302594f614a4352740ac9074d5