Fix accidental use of internal version of sms apis. am: 38f9d4090b
am: f62e1b1ff7

Change-Id: I0d53d5da4ba17122ec6b56ac0330d42ee790cdea