Implemented MOBILE-2193 (Android).