Fix warning.

Change-Id: Ie659ea483f2a2e7202550706216648d6da54a56d
Merge topic 'settings-15161' into next

cbca6e4c Fix warning.