Support 4.8

Change-Id: I85c1df2be498453f63af73337c4a16a4d007cf6e