2.9.8 with a name change

Change-Id: I97b20990294d5565c5159198a64a254c09d2768e
Signed-off-by: Hieu Phan <aznrice2k4@gmail.com>