Fix after merge

Change-Id: I1463d7d6e6fa5da3fccd91f855f9182de4efd90a
Signed-off-by: iceandfire <arhamjamal@gmail.com>