- marged in federated android branch