Blind fix for Android

Change-Id: I091fa9f9fd4c2df1818aadcba7995b174b07f098