Merge "Fix crash in mainline" am: 3a0d51f6b7 am: 6c5944f899
am: 9cd7fdc882

Change-Id: I13d6316005c1df1482f8426a25d672519873b4d1