Resolves a bug which prevents the stored calibration data from loading, only allowing loading of factory-installed calibration data (cherry picked from commit 796961acec)
796961acec