Merge "Update preferred payment related APIs" am: d9b1353771

Change-Id: I378707bcfe81a1e525e9a35e0a2d0382e318dc39