Merge "Cleanup all functions overridden from DCT in GDCT" into honeycomb-LTE