[automerger skipped] RESTRICT AUTOMERGE (CTS) Do not linkify text with RLO/LRO characters. am: 75e3cec289 -s ours am: 8113ea53de -s ours am: 197ec55961 -s ours
am: df56e15c6f

Change-Id: I194a84331adac34ddad42bb1f623660bd4778c1e