updates from garwynn

Change-Id: If8db8bac574dbc541a726eb875332ce1040fc4dd