DO NOT MERGE. Cherry pick to GingerBread. Bug: 3101402 Change-Id: Id7c9418c102d871933c7534fbde18a4bde5f353b