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