Merge commit '47601c74f1302f70716c81714373687358ce8d8b' * commit '47601c74f1302f70716c81714373687358ce8d8b': Add needsOtaServiceProvisioning and used to not allow
Merge commit '47601c74f1302f70716c81714373687358ce8d8b' * commit '47601c74f1302f70716c81714373687358ce8d8b': Add needsOtaServiceProvisioning and used to not allow