Merge "Make hidden APIs test timeout longer" into tm-dev