Merge "Update IntentFactory to construct intents using RemoteActionTemplate... objects that are returned by the model"