Merge branch 'stable-3.1'

Change-Id: I9c34cec575fdcfb14b9af5d0b5ef8ed51dc51138