found by PMD Change-Id: I3d150421948d17eaed34fac2b1a212da34288d1a
android specific code, wrapper logic and tests