reduce dalvik whining

Change-Id: Ibc681d740bb804307836d0117ee3e0dad6379f06