Merge "Avoid SecurityException when calling getUserData" into lmp-mr1-dev