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: a865ef73 am: dd73c123
Change-Id: Iee76a0650803f4119461bf822d23202156f9f5c0