Tweak for better android performance

Change-Id: I5ecebcdc0823252418f0d9918f0fa20840bfca09