Merge "Replace xargs with other shell command" am: 18545d3852 am: 6aa4d948b9
am: 08e56a5826

Change-Id: Idc1163dc5a6002addacf174c78c4f79af6192b4a