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

* commit 'ba1556f1d031ddb1adde8ba8764b6039ac9b3ec8':
  Additional cleanup of start_device_log.