fix merge

Change-Id: I69b78807db2dd756ccbb35f9fdef59710a44b512
Signed-off-by: ChampionSwimmer <championswimmer@aokp.co>