Merge pull request #2741 from alalek:icv_android