Upgrade support in 1.30 branch
.

Change-Id: I2dcac1e3e00c71c27d1761861f354faddbef76b4