am b0800488: Merge "Address some code style nits." into ub-camera-everglades

* commit 'b0800488c841a3bd5238e5f9015c941c2c4f8f8c':
  Address some code style nits.