-P has to come before -D to have an effect on the files read from the
directory.
Fixes: 130160833
Test: atest acloud_test
Change-Id: I62a998f1ad1e3b45f590babbf39330955d368373
Merged-In: I62a998f1ad1e3b45f590babbf39330955d368373
(cherry picked from commit 09364fd955)