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

Change-Id: I80e723c14878d24a4a5d131bb8976f674a6f629f