b/4490619, http://code.google.com/p/android/issues/detail?id=16644 Change-Id: Ia227c87cba61e0d0b6f86b01a064a3eefe447fe1