Merge "veridex: fix a sketchy switch scope"
am: 941b5068d8

Change-Id: I5c2eaf4344bc16330b128702d89d2bd6b4501187