[automerger skipped] Merge "Log the last error code of StatsLog failures" am: 796e61c279 am: d091c7a644
am: 6b13df0e6a  -s ours

Change-Id: I002aaca75be79e920ae7f3e5ac2b65fdc1821ab8