am 6138a43c: Merge "Retry intent verification 3 times before failing." into mnc-dev

* commit '6138a43ca9b312014bc9f57c1802180dc88188b2':
  Retry intent verification 3 times before failing.