Commit after few changes for import 

Change-Id: Ib8c94f6000127d2df3d58d30b6e0c3a5e9f91d1b
Signed-off-by: atiwari5 <atiwari5@gmail.com>