Merge "Fix public bug http://code.google.com/p/android/issues/detail?id=10067" into gingerbread