more updates

Change-Id: Ie3967b95bdea3897d5126911f11a63978cc606ed