Kangedpicked commits from CM review part 2#

Since most of the changes are relatively little, I will continue this
Until most of the changes or the important ones are merged.

Original from http://review.cyanogenmod.org/#/c/54069/

Thanks to OliverG96