am 6bcac81e: am 7639a6ab: Merge "Reset failed decryption count on successful decryptions" into lmp-dev

* commit '6bcac81e6a8db504dc32d89907f847b5a9118817':