Fix the recent merge derps

Change-Id: I91b9d4c9050b361ebe1c0c3ec4f6e7e962eed5a7
Signed-off-by: Lokesh Chamane <lokesh.c703@gmail.com>