[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 am: f4d040af -s ours
am skip reason: Change-Id I388bd58e79cd4310ad286bcc5688e96b16787be0 with SHA-1 75aac04c is in history
Change-Id: If00261a369fcf2b275b79922be8b6548e6f60c2e