The original patch for this bug fixed the problem for
rocky only but queens also suffers from the same
problem. Since the only diff between the P and R
templates is this change, move it into Q so that
Q and R will both get the fix.
Change-Id: Ib4573aa925cb1b3b9e1fa04e8a3c5bf611223c25
Related-Bug: #1788631
(cherry picked from commit 31a7dd32d7)