Android 3.0 release 1.2
Mass merge from gingerbread - do not merge

Change-Id: I96446732619cd4360c651baff8f446a3e53c03c9