Merge "More idiomatic cleanup of 9f75a035713d216469f1cabfe4a65f7864e2145a." am: a48dc55f32
am: 14f74dae87

* commit '14f74dae876482a2eb41e8a3802cc5b39224662a':
  More idiomatic cleanup of 9f75a035713d216469f1cabfe4a65f7864e2145a.