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

Change-Id: I689671afb25643d2e36e65e13374dd69051341b2