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

* commit 'a48dc55f326937d29a791e4016f980c589612333':
  More idiomatic cleanup of 9f75a035713d216469f1cabfe4a65f7864e2145a.