Prepare weekly 6.2

Change-Id: Id252e1c02d067cf1fca4dd4acfcad51159692893