Merge "Remove segfault."
am: e89d260e2c

Change-Id: I4c9efb2ef88bd5a72eb49f0d3129fb8117b6d59f