Fixing gradle version conflicts
am: b3b43923bd

Change-Id: Ia670b07a33c26f83bdd470e29d8b47a8b7ffaf39