Fix from cherry-pick

Change-Id: I1b2acc7a2f1cf5a9dd65a4980f55ec3c0864b12c