Merge "CloudSearch API: adds two keys for app intents in ExtraInfo" into tm-dev