Derp Fix v1.3

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