code simplification & optimization
Merge branch 'master' into ice-cream-sandwich
field name
Merge branch 'master' into ice-cream-sandwich