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

Change-Id: I77cb537a42cd3e96396f329dfaec13ff17aff167