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

Change-Id: I9e5ede2ee1fc306fad4fc20f84447c65913a2d9f