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

Change-Id: Iaf833dd548543d7b0f8e6353080692fbb3ab7cd2