4.8 Is Unstable with -02

Change-Id: I9390af68c9f57f2e01f317f710b19f73cc3c3beb