Version 3.1.8

Change-Id: Iaacb34d5c6dce9731c339a89bc5c1a19061f4f98