Merge \\\"Don\\\'t use SMS database until after the phone is unlocked\\\" into...
Merge \\\"Don\\\'t use SMS database until after the phone is unlocked\\\" into nyc-mr1-dev am: 986c5d44 am: 6bcafca3
am: d09ce24a
Change-Id: I0e6a431b97f12c108c91c7af12d9b7b77e915166