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

Change-Id: I1f1dad1f95fb724fc56015f6616e4cb4d5e5b0f5