Merge "Don't post throttled notifications again."
am: 619080d929

Change-Id: I12bc8ac438f1d330705ad14074a1edbd66aaa718