Allow warnings to migrate to rustc-1.40.0 am: 7a6bcadee4 am: 9a726a08d1

Change-Id: I55fcb54f35278c815be323a4bf746a8b4d245262