changes by arco

http://review.cyanogenmod.org/#/c/58688/
http://review.cyanogenmod.org/#/c/58689/