Fix tests.

Change-Id: I943461e8303b845c359cb72f2d1149d74103488b
Merge topic '14790_save_restore_settings_buttons' into next

f36e55d6 Fix tests.
Fix tests.

Change-Id: I96a54423035faad4db013ae7309dae12119b6a7a
Merge topic '14790_save_restore_settings_buttons' into next

219838ea Fix tests.
Fix tests.

Change-Id: I943461e8303b845c359cb72f2d1149d74103488b
Merge topic '14790_save_restore_settings_buttons' into next

f2a2d69a Fix tests.