fix problems with merge.

Change-Id: Ib4afbd82a74fc4aa38a614599f41756367091345
Signed-off-by: klozz <xxx.reptar.rawrr.xxx@gmail.com>