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

Change-Id: I18de067739532452175f2cdfde7288b5452b5cd8