pre android merge
merge from android lan