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

Change-Id: Ib74abddd20d84e1841564598161fe916f9b14ca3