Version 3.1.7

Change-Id: Id5d3bfc2a137ddc901cfe0643704f52784fa6dbd