Merge "Stub the oemlock operations when the PersistentDataBlock is not supported" into qt-dev