Merge "Merge "Set LEGACY_STORAGE only from READ_EXTERNAL_STORAGE" into qt-dev am: 88d88df174 am: d4cea70382 am: 1213f88a90"