Merge "Fix warning on the build servers" am: 7b45384a7a am: 2968e8c28a am: 60d2f533e2
am: fbff313cc9

Change-Id: Id68eaf5fafd5173c2d4c12c6e25d0fe9623bb50b