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

Change-Id: Icc14d7c878a4037bf4fe7fd17b2fd28cb26f3386