am 7b62f488: Fix b/5401109.

* commit '7b62f4889a95406a00a4a5f25ef15f01322607eb':
  Fix b/5401109.