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

Change-Id: I5a61322286c8a02b84910f3129140d0fecf60bfd