DO NOT MERGE Fail gracefully when we fail to fork the update binary am: de1b53d067
am: 78563fdf78  -s ours

Change-Id: I884f148f0c1e18281c4ed394b1b6be8e7a0a7f78