Merge "Add --avoid-storing-invocation option" am: 8f13b262bd
am: 0c43834e2c

Change-Id: Icc6b5cf2d30c388240f57624fa90c420f12aa86a