Adding safelocalize

Change-Id: Id995be2e465241f84818e3d0d8407510b497dba0