Code freeze build.8

Change-Id: Ib68eaf3beb2c09d6dc08ef63c54f7ef6d02f8638