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

Change-Id: I5425ca6ef3f65fbbec7b6d105054d9abf9d39c09