ARCHI Android optimizations

Change-Id: I2c95600cfe87700416c25a7bd12646b57d796084