am b3c0d6a1: am 39637a37: Merge changes I3641b7c0,Ibdd1dbc8 into froyo