updating as per review comments
updating as per review comments

pkeb/sdl_core,JackLivio/sdl_core,JackLivio/sdl_core,smartdevicelink/sdl_core,APCVSRepo/sdl_core,BrandonHe/sdl_core,LuxoftAKutsan/sdl_core,AByzhynar/sdl_core,smartdevicelink/sdl_core,BrandonHe/sdl_core,LuxoftAKutsan/sdl_core,JackLivio/sdl_core,APCVSRepo/sdl_core,APCVSRepo/sdl_core,pkeb/sdl_core,LuxoftAKutsan/sdl_core,AByzhynar/sdl_core,BrandonHe/sdl_core,LuxoftAKutsan/sdl_core,AByzhynar/sdl_core,smartdevicelink/sdl_core,JackLivio/sdl_core,BrandonHe/sdl_core,smartdevicelink/sdl_core,LuxoftAKutsan/sdl_core,BrandonHe/sdl_core,JackLivio/sdl_core,AByzhynar/sdl_core,LuxoftAKutsan/sdl_core,pkeb/sdl_core,AByzhynar/sdl_core,APCVSRepo/sdl_core,pkeb/sdl_core,AByzhynar/sdl_core,APCVSRepo/sdl_core,BrandonHe/sdl_core,JackLivio/sdl_core,pkeb/sdl_core,pkeb/sdl_core