Version 3.1.7

Change-Id: Ic13a455379ed6fffb86a5d7827cb5a5aa405f4f4