Merge "Fix crash in monodroid apps" into oc-dr1-dev
am: 3d80a73350

Change-Id: If80299af64fac8138e4cf9b681ebed13e09b8ccf