Version 3.1.2

Change-Id: I1309ab7fcc854cc9a50dc016b01d6dd3c3e090dd