For stable/queens. Change-Id: I6d8d1bbe54b1a382fcbf83a1aef1fa389c43c1fc (cherry picked from commit 4cddc815c2)
4cddc815c2