Merge "Add subplans and extend retry feature for CTS/GTS" into nougat-cts-dev