[automerger skipped] Skip tests if the shims are too old for them to pass. am:...
[automerger skipped] Skip tests if the shims are too old for them to pass. am: 5ce2db96 -s ours am: 4ffd35b4 -s ours
am skip reason: Change-Id I388bd58e79cd4310ad286bcc5688e96b16787be0 with SHA-1 5ce2db96 is in history
Change-Id: I51224e95358384990ff63e2fa43e569091600296