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