Skip invariant checking and adding when nothing provided

Change-Id: Icc3dca675820d331fb1d6e8f3a5a4169d1b2d113
Merge "Skip invariant checking and adding when nothing provided"