1.8.0.5

Change-Id: Ia25febe2d9dd9607bf78c2a54019d94c39520b51