Add subplans and extend retry feature for CTS/GTS
am: c2b0668c6c

Change-Id: I242c54bac7ff0583b4b25ac35eb14e9bdfc77f0e