Unconditionally set the bot parameter to match the core behaviour

Change-Id: I79c5952448a71a97e6fbf6092b35567aa6395d0f
Merge "Unconditionally set the bot parameter to match the core behaviour"