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

Change-Id: I26e6110df3d88d64c6ed7ad2b6b1c2be824292be