merge from tag exdroid_a10 part1
merge foram tag exdroid a10 part2