Add blaze & exhilarate

Change-Id: I526a75cb798ae0a862e81478a6ab60baceb52ac4
Merge remote-tracking branch 'upstream/jb3' into local_jb3