Merge "Fix wrong usage of * in find command" am: b3502943dc
am: 7323eeb32f

Change-Id: I83e27ddc01e850cc3b5ac413cd820be28fed9864