*8824* Fixed lint errors
*8824* Submodule changes track