Update to 1.3.30

Change-Id: I3903c90f9d3184b21ca71fc3662a7f194ef09130
Fixed 1.3.30 compilation

Change-Id: Ib3ca51ed1a476d0f91b60829a60aab329d7f68c1