Match up with Liquid Smooth and Voip Fix.

Change-Id: If5eb9a4dcf7a54b965926c96472b30813c43a377