Merge Andorid 5.0.2 relase