Merge "Fix delay_save and multiple required fields." into qt-dev am: eea916967a
am: 44b7663414

Change-Id: Id18fb63f74aec58c3fa04c695629ab10dfe713f4