Some fixes to make Build.props Mods working

Change-Id: I9e4ded31dfd7d2cb41f1081e366601f9caecdce1