Merge "Log the last error code of StatsLog failures" am: 796e61c279
am: d091c7a644

Change-Id: I91b081a001b02fe270ab3f2d55e64f360477faad