[automerger skipped] SF: Fix DisplayTransactionTest
am: 02cfa90e7e  -s ours

Change-Id: I88d8e3b2799304d647103fd71d5948632cfac8d6