Merge "Explicitly request clearing of external storage." into qt-dev am: 99e3db0bd3
am: 61c14f3b40

Change-Id: I0e63242720585014a2fb6fe6515a365dddb6d699