Refactor merging of L10n-bot patch sets

Change-Id: If71fa0b412fc40d645527b402d9bf0720a338e98
Merge "Refactor merging of L10n-bot patch sets"