Merge "Fixing TaskPersisterTest" into oc-dr1-dev am: 928aad3e4d am: ab0e78c4b4
am: 023dbcd1c1

Change-Id: Ieefdd854ee044c245234a8fc62db61d3b58943d1