am b5afeca3: am a865bb5d: Merge "Use the correct method to check if device is...
am b5afeca3: am a865bb5d: Merge "Use the correct method to check if device is encrypted" into lmp-dev
* commit 'b5afeca3':
Use the correct method to check if device is encrypted