Leftovers

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