Merge "Upgraded click to RC2.1 stage" into gingerbread