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

Change-Id: I098cd1c8d3ecf9c264a9720db226e123b6b7170f