Merge "Merge "Fix delay_save and multiple required fields." into qt-dev am: eea91696 am: 44b76634" into qt-r1-dev-plus-aosp