Version 3.1.2

Change-Id: Ia3a30c45604756554a8cad54d855f96dba46a88f