Simplify shim content validation logic. am: 9b813b533f am: 45bba5bccd
am: a341c811e5

Change-Id: Ic48bed588d3d70f57e674daef2b8b264713e40df