Merge "Add missing secure stop methods" into lmp-mr1-dev