merge upstream from omnirom:android-4.4 

merge new change from upstream