white spaces changes

Change-Id: I8b80dee9fb0769d2fd751275d30155a2e4741ad6
Merge "white spaces changes"