Using a common gradle dependency path
am: 70266689b7

Change-Id: Idc95a25914c8ad107ede066b8a012f70f3c63145