am ca2b67e1: Merge "Additional cleanup of start_device_log."

* commit 'ca2b67e1173221a2223164d977eeaf16a646e853':
  Additional cleanup of start_device_log.