Merge "Fix smart_linkify_enabled flag." into pi-dev
am: e9a7cb8158

Change-Id: I8789a58acd22898dfa0ff301132efbafbf8ab8d8