more staging for perfect android

Change-Id: I206ff3eef0d65fa2bbea3ba284895da08cbbc7fc