bug 968026 - cherrypick and rebase upstream commit a9a5f453467d1494ebf9f31cba99c2c49b37fd52 to fix potential OTS crash. r=fredw