Version 3.1.6

Change-Id: I542f7ff6860b1e57c99809092a827c8421a63dd9