Semi-Final commit with Android Source code