Simplify shim content validation logic.
am: 9b813b533f

Change-Id: I358fb634a23e5e9208b71e95db2a0169afd1bc69