Merged branch nougat-x86 into n7.0-x86