Merge branch 'stable-3.1'

* stable-3.1:

Change-Id: I313f841088fdf5815d4adbecc17723872dcf8372