Fix merge derps and errors

Change-Id: I0427f94b9f933e1466b06c3cb6f7faa790568c9b
Signed-off-by: Zhao Wei Liew <zhaoweiliew@gmail.com>