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

Change-Id: I6492269905da94eeff486d816e4964b0efb272a5