Update branches for stable/rocky

Change-Id: Ia6de4b83f56c5ac0af19b0ca4f12aa4d47fd963a
2 files changed