Merge "Treat mock locations the same for wakelocks"