Merge "Fix calibrated/uncalibrated verification b/17671711" into lmp-dev