Merge "Merge "Fix condition where FP would require confirmation" into sc-dev am: c52f2f069f am: 0ccccb8cff" into sc-v2-dev-plus-aosp