Merge "Tombstone Monitor for CVD" into master-cuttlefish-testing