Merge "Resolving race condition while writing recent taskids" into nyc-mr1-dev am: 769bc6c8b1 am: 9dbdbf461e
am: 29ac4b3f25

Change-Id: I7f55d2e0a89633283adb9cbb9b604473bb2cc781