This fixes http://code.google.com/p/android/issues/detail?id=35988 Change-Id: I1880d7e41028f034e75a048226cce3bf96845a09