It ia causing tests failures and exception at the app start. This reverts commit d35a974b76cb0b3387aff7780d101e3f7de2ebd3. Change-Id: I2577f723a7e25d4dcc12050791c65a900ac41f7d
It ia causing tests failures and exception at the app start. This reverts commit d35a974b76cb0b3387aff7780d101e3f7de2ebd3. Change-Id: I2577f723a7e25d4dcc12050791c65a900ac41f7d