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

Change-Id: Id098b43a061d2447f152b38f8007001464d2a485