Exact same scenario with me. Bootloader unlocked but not rooted. I tried method #2 but I’m still getting only Now On Tap. I checked the build.prop and it still has the changes, but Settings -> about still says Nexus 6p as well.