Fixing first build Issues

Signed-off-by: Bhanuji <bhanu.555prakash@gmail.com>
Merge branch 'dev_bhanu' into dev_final