Merge "Reduce the latency of receiving preferred payment changed intent" am: ba606b039c

Change-Id: I05ba5fd50b5552f7a0e4fb211305690c0b5c3341