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

Change-Id: I4d0c13b480cdd0f2fa134716575e86630a7e90d4