Merge "Fix a bug with the settings for skipping integrity check for...
Merge "Fix a bug with the settings for skipping integrity check for verifiers." into rvc-dev am: 9651ab2d am: f0513277 am: eae775ff am: abc9aad4
Change-Id: Ic58b967608d50c98854d28a4bb575a085deed9e5