Also added logging to heartbeats so we can detect failures better during testing. Resolved merge conflict from https://android-git.corp.google.com/g/#change,107298 Change-Id: I0d731f4d21555eff7c80e34fed4b8c335023edc1