[automerger skipped] RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters. am: d9e75a497e am: 3f552669e3 -s ours am: 4c7d37551c -s ours
am: 2e28ea61b6 -s ours
am skip reason: change_id Ib2ee544b5783234fba8ee2f93adf0b36b039520f with SHA1 4e3507d544 is in history

Change-Id: I479e3a6a7727c99551c3495626a0c8364836151c