Resolve the merge problem

Change-Id: Ie3e59494588a9c34a642b1ce4e2f88ffd6d0139f