code simplification
KILL action
Merge branch 'master' into ice-cream-sandwich