* stable-2.16: Use com.google.inject instead of javax.inject Change-Id: I38fca808946e7f4c91e7a7ba7c1bfef3d2d787d2