am 6c53de92: Follow up to change b638126ed DO NOT MERGE.

* commit '6c53de92cf7e759488538280788325fac6ccdea2':
  Follow up to change b638126ed DO NOT MERGE.