 Added fixes for android nougat