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

Change-Id: I996a7288afbe58be416ed3f8cdb8c3b41727def1