Resolved another issues

Change-Id: I14dfd47fcd3e1f530c18d45444ee2e89cc1cc416
Merge "Resolved another issues"