Integration : branch merge + rev 209878 209880 210615 211211

Change-Id: I03986d6d0c5471fdc707a4c5cb75c4f162cff858