Merge "Add ability to store invocation information in an external file." am: 163a37ad5f
am: d275702c81

Change-Id: Ia33efa151036d2c19c032e20db4d129d1495f8eb