Save point, trying out different dependencies

Change-Id: I68c2d6c2eeac42c22e8f3ee3bae87bd71a73efdc