Updates for release tag 9.0.5

Change-Id: I5f75c609b1f02be5a1428d98c8af5551c4d3fc9f