Merge "Specify physical address in hex, to fix broken test."