Merge "Fix external bug http://code.google.com/p/android/issues/detail?id=15183" into honeycomb-mr1