Merge "Bug 457241 : build properties adjusted"