Merge branch 'stable-3.1'

* stable-3.1:
  Fix directory of test file

Change-Id: I149c889ec6e5c0b15fe7ca175f1bc8a74121b8a2