more protection from ambigious intent resolves
repackaging
Merge branch 'master' into ice-cream-sandwich