import downstream changes to reduce our diff

Change-Id: I8f6ca70a6625b1250bb205ae1f062988324a5670