weekly 1.6

Change-Id: Ie8f06fe76c801819649f1fffbc820319985a3abf