* commit '6a19759c0fae744e80c032ca3c23932e73e6d9d9': Do Not Merge: Cherry-pick change I7667f9b8 to GingerBread