am 301fb4d6: am ca2b67e1: Merge "Additional cleanup of start_device_log."

* commit '301fb4d6c9502ff3bbecf64277862dfd69dec153':
  Additional cleanup of start_device_log.