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

Change-Id: I50cc9abab455cd61872227c77b3cc347672dbc02