Version 3.1.8.

Change-Id: Iea630324f42ad9664e14847a4b2b9c30d620a535