Merge "Add device info field for encryption" into lmp-sprout-dev