Fix accidental use of internal version of sms apis. am: 38f9d4090b am: f62e1b1ff7
am: 98784c3187  -s ours

Change-Id: I9db5e8e347f181192969b50cd4faae95ebc172dc