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

Change-Id: I52eccf1856870c844e2bbccf902bd2c3b8a20598