Merge "Request MANAGE_EXTERNAL_STORAGE permission" am: 3dca32381d am: f5534b4e10

Change-Id: I02f3c276b7ea374e5d056260676e1eab06324fad