1.9.5.4
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	AndroidManifest.xml