Fix warning code

Change-Id: Ibc78699cda6fcf86c29ffab15dd88eab376801d8
Merge remote-tracking branch 'origin/master'