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

Change-Id: I66c03cc6b3af28c4f8bd2e3f803473404db9633e