Change message count overflow to 6

Change-Id: Idb12d332ec971db0879499251b272761c6328444
Bug: 183382000
Test: manual
1 file changed