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

Change-Id: Id1796f42598f56a59beda381388448eefd6353cc