Merge "Stub the oemlock operations when the PersistentDataBlock is not supported" into qt-dev am: 13ee78763d am: 5c35267723
am: 73021ba346

Change-Id: Iccd54b0ce2455767a90f80b4e373f57539d494b6