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

Change-Id: Ied38fadacd210b89c01eecf97c4358b868c388f9