Merge "Add Context.getNoBackupFilesDir()" into lmp-dev