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

Change-Id: I1b9e6b5dc3e01ab98928021d4ba72669d50ac1a4