Merge "Remove mandatory address for non moving space / zygote" into pi-dev