ce2ebf8d73
See http://code.google.com/p/android/issues/detail?id=6697 for details about this change. Change-Id: I516f00c6f3bc99b22be51669e4573246bdd6e33d