Merge "Small fix for get flow pending intent fill data Test: make"