Merged with Samsung Open Source Update 9 NG8