Update - Android#17

Ahmed-Sellami wants to merge 2 commits intomboeddeker:mastermboeddeker/disk_space:masterfrom

Ahmed-Sellami:masterAhmed-Sellami/disk_space:masterCopy head branch name to clipboard