am 17b6a39f: am af59eec7: am e83d8a69: Merge "Fix memory leak in parse_action"

* commit '17b6a39f04c291c6002a22ec60eecdea51f86170':
  Fix memory leak in parse_action