[13092076] Work around android ICS issue: https://code.google.com/p/andr...

...oid/issues/detail?id=19625

@CHenrie Please review