Bug fixes for 2930 ,2855

Change-Id: I68abf200d0701b619539a692981ada4b367f2dab
Merge "Bug fixes for 2930 ,2855"