570791: sync master and m_3_25_x

Change-Id: Ibdbf614ca9a0eed3929c4fd145a73c75753c028e
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=570791
1 file changed