fix cherry attempt 2

Change-Id: I18d4ddc6aad67eb06743f2da27171d8ea360dfbb