Merge "Remove duplicate dependency introduced in ag/13a8889"