Merge "Phone process crashes during the stability test." am: 972dec0c81 am: b0a6e84a55

Change-Id: Ied5594be0c2b8dddc1d74338d0b080bd678ffed1