@AndrewT. Would it be possible for you to try
my solution? I don't know why but OP never replies back to me. Never did this time or the last time. If you try that solution, please have appropriate measures to deal with a boot loop, though
it shouldn't cause any issue since I'm running my Nexus 6 on Android 6.0.1 perfectly with that solution.