Version 3.1.1

Change-Id: I60d27712f716b239153d3d0d1a6a8bd25c9bd7f9
Fix version dependancy.

Change-Id: I927ae28e88b93f6d3a9515fb272b36742f433813