Merge "Introducing "strict project map"." into froyo