am f06308ed: am f58f13c7: Merge "Fix Layout Issue in Verifier" into ics-mr1

* commit 'f06308edaddc07a5c3bc4b897db1e0ba725026e1':
  Fix Layout Issue in Verifier