Minor tweaks to match Google's internal code.

This better aligns the two variants of the code to try to avoid
future merge conflicts and other surprises.

Change-Id: I703b8b99f10a9bac4128ea8ac36d0da7fd0ddc9f
Merge (-sours) commit '380168a4cab0a3698493d30942a1bb3c3da805f8' into oxygen_4.3

* commit '380168a4cab0a3698493d30942a1bb3c3da805f8':
  Minor tweaks to match Google's internal code.