am 75f912ca: am dd309b97: Merge "Handle the case where an asynchronous prepare...
am 75f912ca: am dd309b97: Merge "Handle the case where an asynchronous prepare was initiated and then" into jb-mr2-dev
* commit '75f912ca':
Handle the case where an asynchronous prepare was initiated and then