Derp Fix v1.2

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