We should be consistent with the value of autoInserted flags

Change-Id: Ie87c591b079ea9e0f064bc1ace41f5f1c83cacc9