am 335b82ed: Merge "Add device info field for encryption" into lmp-sprout-dev

* commit '335b82edac94996fe27a282d21f0a502426e1285':
  Add device info field for encryption