Fix merge

Change-Id: I80893d1be6a5ae133e0795c8f678b105e94f22eb
Fix merge

Change-Id: I4dcc95963dae73add9c64585aa449b0b62f9a36b
Signed-off-by: ayysir <dresadd09691@gmail.com>