perfect android 2.0

Change-Id: I0d659e84d503088eb8df0455923a3b3f184dad56