am 1ae85153: Merge "Fix missing transport in keyguard" into klp-dev

* commit '1ae85153c804553365d18715824fd3a569f8ce18':
  Fix missing transport in keyguard