merge branch fix-e/apps/eDrive#23-nougat

1 job for change-package-name-n in 2 minutes and 4 seconds