Fix from cherry-pick

Change-Id: I003ead7e2b4cfa405b93602338ac73bc78a25f99