Prepare release 3.0.5

Change-Id: I715e35b9439284962ec3aa2a2ced02a2415534f8