fix device branding (credit to XDA user Silentwidow)
Update with master

g branch 'rqkang/jb-mr1' into jb-mr1

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.