merge with Samsung sources Update5 (NB8-Kitkat)