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

Change-Id: I11c65cd3194427fc43fe0cea445715d1f8ce2254