Merge "CM Gerrit tool to make submissions easier" into froyo