Merge "Unreliable number(255) for voice message count should not be provided"...
Merge "Unreliable number(255) for voice message count should not be provided" am: 619d1c03 am: 31ed7fa8
am: 44214310
Change-Id: Ie45bb72045f90b393ca0ffc2f14fc7eb7b692b49