summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBilal Alsharifi <bilal.alsharifi@gmail.com>2019-03-04 11:54:25 -0500
committerBilal Alsharifi <bilal.alsharifi@gmail.com>2019-03-04 11:54:25 -0500
commit6aa38653411257300a77a885064dc9ddda4cd35f (patch)
tree72ea420e134ca6ef5d0b937a8656ca657055c6b4
parente59b00f4443f7d3e90c86bae562cde3decd95127 (diff)
downloadsdl_android-6aa38653411257300a77a885064dc9ddda4cd35f.tar.gz
Move sdl_android to a subfolder
-rw-r--r--android/CHANGELOG.md (renamed from CHANGELOG.md)0
-rw-r--r--android/LICENSE (renamed from LICENSE)0
-rw-r--r--android/README.md (renamed from README.md)0
-rw-r--r--android/build.gradle (renamed from build.gradle)0
-rw-r--r--android/gradle.properties (renamed from gradle.properties)0
-rw-r--r--android/gradle/wrapper/gradle-wrapper.jar (renamed from gradle/wrapper/gradle-wrapper.jar)bin53636 -> 53636 bytes
-rw-r--r--android/gradle/wrapper/gradle-wrapper.properties (renamed from gradle/wrapper/gradle-wrapper.properties)0
-rwxr-xr-xandroid/gradlew (renamed from gradlew)0
-rw-r--r--android/gradlew.bat (renamed from gradlew.bat)0
-rwxr-xr-xandroid/hello_sdl_android/build.gradle (renamed from hello_sdl_android/build.gradle)0
-rwxr-xr-xandroid/hello_sdl_android/proguard-rules.pro (renamed from hello_sdl_android/proguard-rules.pro)0
-rwxr-xr-xandroid/hello_sdl_android/src/main/AndroidManifest.xml (renamed from hello_sdl_android/src/main/AndroidManifest.xml)0
-rwxr-xr-xandroid/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/MainActivity.java (renamed from hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/MainActivity.java)0
-rwxr-xr-xandroid/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/SdlReceiver.java (renamed from hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/SdlReceiver.java)0
-rwxr-xr-xandroid/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/SdlRouterService.java (renamed from hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/SdlRouterService.java)0
-rwxr-xr-xandroid/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/SdlService.java (renamed from hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/SdlService.java)0
-rwxr-xr-xandroid/hello_sdl_android/src/main/res.zip (renamed from hello_sdl_android/src/main/res.zip)bin71117 -> 71117 bytes
-rwxr-xr-xandroid/hello_sdl_android/src/main/res/drawable/sdl.png (renamed from hello_sdl_android/src/main/res/drawable/sdl.png)bin3274 -> 3274 bytes
-rwxr-xr-xandroid/hello_sdl_android/src/main/res/layout/activity_main.xml (renamed from hello_sdl_android/src/main/res/layout/activity_main.xml)0
-rwxr-xr-xandroid/hello_sdl_android/src/main/res/menu/main.xml (renamed from hello_sdl_android/src/main/res/menu/main.xml)0
-rwxr-xr-xandroid/hello_sdl_android/src/main/res/mipmap-hdpi/ic_launcher.png (renamed from hello_sdl_android/src/main/res/mipmap-hdpi/ic_launcher.png)bin6614 -> 6614 bytes
-rwxr-xr-xandroid/hello_sdl_android/src/main/res/mipmap-mdpi/ic_launcher.png (renamed from hello_sdl_android/src/main/res/mipmap-mdpi/ic_launcher.png)bin3515 -> 3515 bytes
-rwxr-xr-xandroid/hello_sdl_android/src/main/res/mipmap-xhdpi/ic_launcher.png (renamed from hello_sdl_android/src/main/res/mipmap-xhdpi/ic_launcher.png)bin9073 -> 9073 bytes
-rwxr-xr-xandroid/hello_sdl_android/src/main/res/mipmap-xxhdpi/ic_launcher.png (renamed from hello_sdl_android/src/main/res/mipmap-xxhdpi/ic_launcher.png)bin17100 -> 17100 bytes
-rwxr-xr-xandroid/hello_sdl_android/src/main/res/mipmap-xxxhdpi/ic_launcher.png (renamed from hello_sdl_android/src/main/res/mipmap-xxxhdpi/ic_launcher.png)bin25896 -> 25896 bytes
-rwxr-xr-xandroid/hello_sdl_android/src/main/res/values-v11/styles.xml (renamed from hello_sdl_android/src/main/res/values-v11/styles.xml)0
-rwxr-xr-xandroid/hello_sdl_android/src/main/res/values-v14/styles.xml (renamed from hello_sdl_android/src/main/res/values-v14/styles.xml)0
-rwxr-xr-xandroid/hello_sdl_android/src/main/res/values-w820dp/dimens.xml (renamed from hello_sdl_android/src/main/res/values-w820dp/dimens.xml)0
-rwxr-xr-xandroid/hello_sdl_android/src/main/res/values/dimens.xml (renamed from hello_sdl_android/src/main/res/values/dimens.xml)0
-rwxr-xr-xandroid/hello_sdl_android/src/main/res/values/strings.xml (renamed from hello_sdl_android/src/main/res/values/strings.xml)0
-rwxr-xr-xandroid/hello_sdl_android/src/main/res/values/styles.xml (renamed from hello_sdl_android/src/main/res/values/styles.xml)0
-rwxr-xr-xandroid/hello_sdl_android/src/main/res/xml/accessory_filter.xml (renamed from hello_sdl_android/src/main/res/xml/accessory_filter.xml)0
-rw-r--r--android/sdl_android/ROUTER_SERVICE_MESSAGING_PROTOCOL.md (renamed from sdl_android/ROUTER_SERVICE_MESSAGING_PROTOCOL.md)0
-rw-r--r--android/sdl_android/bintray.gradle (renamed from sdl_android/bintray.gradle)0
-rw-r--r--android/sdl_android/bintray.properties (renamed from sdl_android/bintray.properties)0
-rw-r--r--android/sdl_android/build.gradle (renamed from sdl_android/build.gradle)0
-rw-r--r--android/sdl_android/proguard-rules.pro (renamed from sdl_android/proguard-rules.pro)0
-rw-r--r--android/sdl_android/src/androidTest/AndroidManifest.xml (renamed from sdl_android/src/androidTest/AndroidManifest.xml)0
-rw-r--r--android/sdl_android/src/androidTest/assets/json/AddCommand.json (renamed from sdl_android/src/androidTest/assets/json/AddCommand.json)0
-rw-r--r--android/sdl_android/src/androidTest/assets/json/AddSubMenu.json (renamed from sdl_android/src/androidTest/assets/json/AddSubMenu.json)0
-rw-r--r--android/sdl_android/src/androidTest/assets/json/Alert.json (renamed from sdl_android/src/androidTest/assets/json/Alert.json)0
-rw-r--r--android/sdl_android/src/androidTest/assets/json/AlertManeuver.json (renamed from sdl_android/src/androidTest/assets/json/AlertManeuver.json)0
-rw-r--r--android/sdl_android/src/androidTest/assets/json/ButtonPress.json (renamed from sdl_android/src/androidTest/assets/json/ButtonPress.json)0
-rw-r--r--android/sdl_android/src/androidTest/assets/json/ChangeRegistration.json (renamed from sdl_android/src/androidTest/assets/json/ChangeRegistration.json)0
-rw-r--r--android/sdl_android/src/androidTest/assets/json/CreateInteractionChoiceSet.json (renamed from sdl_android/src/androidTest/assets/json/CreateInteractionChoiceSet.json)0
-rw-r--r--android/sdl_android/src/androidTest/assets/json/DeleteCommand.json (renamed from sdl_android/src/androidTest/assets/json/DeleteCommand.json)0
-rw-r--r--android/sdl_android/src/androidTest/assets/json/DeleteFile.json (renamed from sdl_android/src/androidTest/assets/json/DeleteFile.json)0
-rw-r--r--android/sdl_android/src/androidTest/assets/json/DeleteInteractionChoiceSet.json (renamed from sdl_android/src/androidTest/assets/json/DeleteInteractionChoiceSet.json)0
-rw-r--r--android/sdl_android/src/androidTest/assets/json/DeleteSubMenu.json (renamed from sdl_android/src/androidTest/assets/json/DeleteSubMenu.json)0
-rw-r--r--android/sdl_android/src/androidTest/assets/json/DiagnosticMessage.json (renamed from sdl_android/src/androidTest/assets/json/DiagnosticMessage.json)0
-rw-r--r--android/sdl_android/src/androidTest/assets/json/DialNumber.json (renamed from sdl_android/src/androidTest/assets/json/DialNumber.json)0
-rw-r--r--android/sdl_android/src/androidTest/assets/json/EndAudioPassThru.json (renamed from sdl_android/src/androidTest/assets/json/EndAudioPassThru.json)0
-rw-r--r--android/sdl_android/src/androidTest/assets/json/GetAppServiceData.json (renamed from sdl_android/src/androidTest/assets/json/GetAppServiceData.json)0
-rw-r--r--android/sdl_android/src/androidTest/assets/json/GetDTCs.json (renamed from sdl_android/src/androidTest/assets/json/GetDTCs.json)0
-rw-r--r--android/sdl_android/src/androidTest/assets/json/GetFile.json (renamed from sdl_android/src/androidTest/assets/json/GetFile.json)0
-rw-r--r--android/sdl_android/src/androidTest/assets/json/GetInteriorVehicleData.json (renamed from sdl_android/src/androidTest/assets/json/GetInteriorVehicleData.json)0
-rw-r--r--android/sdl_android/src/androidTest/assets/json/GetSystemCapability.json (renamed from sdl_android/src/androidTest/assets/json/GetSystemCapability.json)0
-rw-r--r--android/sdl_android/src/androidTest/assets/json/GetVehicleData.json (renamed from sdl_android/src/androidTest/assets/json/GetVehicleData.json)0
-rw-r--r--android/sdl_android/src/androidTest/assets/json/GetWayPoints.json (renamed from sdl_android/src/androidTest/assets/json/GetWayPoints.json)0
-rw-r--r--android/sdl_android/src/androidTest/assets/json/ListFiles.json (renamed from sdl_android/src/androidTest/assets/json/ListFiles.json)0
-rw-r--r--android/sdl_android/src/androidTest/assets/json/PerformAppServiceInteraction.json (renamed from sdl_android/src/androidTest/assets/json/PerformAppServiceInteraction.json)0
-rw-r--r--android/sdl_android/src/androidTest/assets/json/PerformAudioPassThru.json (renamed from sdl_android/src/androidTest/assets/json/PerformAudioPassThru.json)0
-rw-r--r--android/sdl_android/src/androidTest/assets/json/PerformInteraction.json (renamed from sdl_android/src/androidTest/assets/json/PerformInteraction.json)0
-rw-r--r--android/sdl_android/src/androidTest/assets/json/PublishAppService.json (renamed from sdl_android/src/androidTest/assets/json/PublishAppService.json)0
-rw-r--r--android/sdl_android/src/androidTest/assets/json/PutFile.json (renamed from sdl_android/src/androidTest/assets/json/PutFile.json)0
-rw-r--r--android/sdl_android/src/androidTest/assets/json/ReadDID.json (renamed from sdl_android/src/androidTest/assets/json/ReadDID.json)0
-rw-r--r--android/sdl_android/src/androidTest/assets/json/RegisterAppInterface.json (renamed from sdl_android/src/androidTest/assets/json/RegisterAppInterface.json)0
-rw-r--r--android/sdl_android/src/androidTest/assets/json/ResetGlobalProperties.json (renamed from sdl_android/src/androidTest/assets/json/ResetGlobalProperties.json)0
-rw-r--r--android/sdl_android/src/androidTest/assets/json/ScrollableMessage.json (renamed from sdl_android/src/androidTest/assets/json/ScrollableMessage.json)0
-rw-r--r--android/sdl_android/src/androidTest/assets/json/SendHapticData.json (renamed from sdl_android/src/androidTest/assets/json/SendHapticData.json)0
-rw-r--r--android/sdl_android/src/androidTest/assets/json/SendLocation.json (renamed from sdl_android/src/androidTest/assets/json/SendLocation.json)0
-rw-r--r--android/sdl_android/src/androidTest/assets/json/SetAppIcon.json (renamed from sdl_android/src/androidTest/assets/json/SetAppIcon.json)0
-rw-r--r--android/sdl_android/src/androidTest/assets/json/SetDisplayLayout.json (renamed from sdl_android/src/androidTest/assets/json/SetDisplayLayout.json)0
-rw-r--r--android/sdl_android/src/androidTest/assets/json/SetGlobalProperties.json (renamed from sdl_android/src/androidTest/assets/json/SetGlobalProperties.json)0
-rw-r--r--android/sdl_android/src/androidTest/assets/json/SetInteriorVehicleData.json (renamed from sdl_android/src/androidTest/assets/json/SetInteriorVehicleData.json)0
-rw-r--r--android/sdl_android/src/androidTest/assets/json/SetMediaClockTimer.json (renamed from sdl_android/src/androidTest/assets/json/SetMediaClockTimer.json)0
-rw-r--r--android/sdl_android/src/androidTest/assets/json/Show.json (renamed from sdl_android/src/androidTest/assets/json/Show.json)0
-rw-r--r--android/sdl_android/src/androidTest/assets/json/ShowConstantTBT.json (renamed from sdl_android/src/androidTest/assets/json/ShowConstantTBT.json)0
-rw-r--r--android/sdl_android/src/androidTest/assets/json/Slider.json (renamed from sdl_android/src/androidTest/assets/json/Slider.json)0
-rw-r--r--android/sdl_android/src/androidTest/assets/json/Speak.json (renamed from sdl_android/src/androidTest/assets/json/Speak.json)0
-rw-r--r--android/sdl_android/src/androidTest/assets/json/StreamRPC.json (renamed from sdl_android/src/androidTest/assets/json/StreamRPC.json)0
-rw-r--r--android/sdl_android/src/androidTest/assets/json/SubscribeButton.json (renamed from sdl_android/src/androidTest/assets/json/SubscribeButton.json)0
-rw-r--r--android/sdl_android/src/androidTest/assets/json/SubscribeVehicleData.json (renamed from sdl_android/src/androidTest/assets/json/SubscribeVehicleData.json)0
-rw-r--r--android/sdl_android/src/androidTest/assets/json/SubscribeWayPoints.json (renamed from sdl_android/src/androidTest/assets/json/SubscribeWayPoints.json)0
-rw-r--r--android/sdl_android/src/androidTest/assets/json/SystemRequest.json (renamed from sdl_android/src/androidTest/assets/json/SystemRequest.json)0
-rw-r--r--android/sdl_android/src/androidTest/assets/json/UnregisterAppInterface.json (renamed from sdl_android/src/androidTest/assets/json/UnregisterAppInterface.json)0
-rw-r--r--android/sdl_android/src/androidTest/assets/json/UnsubscribeButton.json (renamed from sdl_android/src/androidTest/assets/json/UnsubscribeButton.json)0
-rw-r--r--android/sdl_android/src/androidTest/assets/json/UnsubscribeVehicleData.json (renamed from sdl_android/src/androidTest/assets/json/UnsubscribeVehicleData.json)0
-rw-r--r--android/sdl_android/src/androidTest/assets/json/UnsubscribeWayPoints.json (renamed from sdl_android/src/androidTest/assets/json/UnsubscribeWayPoints.json)0
-rw-r--r--android/sdl_android/src/androidTest/assets/json/UpdateTurnList.json (renamed from sdl_android/src/androidTest/assets/json/UpdateTurnList.json)0
-rw-r--r--android/sdl_android/src/androidTest/assets/xml/MOBILE_API.xml (renamed from sdl_android/src/androidTest/assets/xml/MOBILE_API.xml)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/AndroidTestCase2.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/AndroidTestCase2.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/SdlConnection/SdlConnectionTest.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/SdlConnection/SdlConnectionTest.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/SdlManagerTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/managers/SdlManagerTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/audio/AudioStreamManagerTest.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/managers/audio/AudioStreamManagerTest.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/file/FileManagerTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/managers/file/FileManagerTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lockscreen/LockScreenConfigTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/managers/lockscreen/LockScreenConfigTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lockscreen/LockScreenManagerTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/managers/lockscreen/LockScreenManagerTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/permission/PermissionManagerTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/managers/permission/PermissionManagerTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/ScreenManagerTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/ScreenManagerTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/SoftButtonManagerTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/SoftButtonManagerTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/TextAndGraphicManagerTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/TextAndGraphicManagerTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/video/VideoStreamManagerTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/managers/video/VideoStreamManagerTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/protocol/SdlPacketTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/protocol/SdlPacketTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/protocol/SdlProtocolTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/protocol/SdlProtocolTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/protocol/WiProProtocolTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/protocol/WiProProtocolTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/BaseRpcTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/BaseRpcTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/Config.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/Config.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/JsonUtils.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/JsonUtils.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/Logger.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/Logger.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/NullValues.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/NullValues.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/SampleRpc.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/SampleRpc.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/SdlConnection/SdlSessionTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/SdlConnection/SdlSessionTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/SdlUnitTestContants.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/SdlUnitTestContants.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/Test.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/Test.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/Validator.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/Validator.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/VehicleDataHelper.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/VehicleDataHelper.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/encoder/EncoderUtilsTest.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/encoder/EncoderUtilsTest.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/json/rpc/JsonFileReader.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/json/rpc/JsonFileReader.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/BinaryFrameHeaderTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/BinaryFrameHeaderTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/enums/FrameDataControlFrameTypeTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/enums/FrameDataControlFrameTypeTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/enums/FrameDataTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/enums/FrameDataTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/enums/FrameTypeTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/enums/FrameTypeTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/enums/MessageTypeTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/enums/MessageTypeTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/enums/SessionTypeTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/enums/SessionTypeTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/heartbeat/HeartbeatMonitorTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/heartbeat/HeartbeatMonitorTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/InternalProxyMessageTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/InternalProxyMessageTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/LockScreenManagerTest.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/LockScreenManagerTest.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/RPCMessageTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/RPCMessageTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/RPCRequestFactoryTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/RPCRequestFactoryTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/RPCRequestTest.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/RPCRequestTest.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/RPCStructTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/RPCStructTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/SdlProxyBaseTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/SdlProxyBaseTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/SystemCapabilityManagerTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/SystemCapabilityManagerTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/TTSChunkFactoryTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/TTSChunkFactoryTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/RPCConstructorsTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/RPCConstructorsTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AirbagStatusTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AirbagStatusTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceCapabilityTest.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceCapabilityTest.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceDataTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceDataTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceManifestTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceManifestTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceRecordTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceRecordTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServicesCapabilitiesTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServicesCapabilitiesTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AudioControlCapabilitiesTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AudioControlCapabilitiesTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AudioControlDataTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AudioControlDataTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AudioPassThruCapabilitiesTest.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AudioPassThruCapabilitiesTest.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/BeltStatusTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/BeltStatusTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/BodyInformationTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/BodyInformationTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ButtonCapabilitiesTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ButtonCapabilitiesTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ChoiceTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ChoiceTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ClimateControlCapabilitiesTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ClimateControlCapabilitiesTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ClimateControlDataTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ClimateControlDataTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/CloudAppPropertiesTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/CloudAppPropertiesTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ClusterModeStatusTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ClusterModeStatusTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/CoordinateTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/CoordinateTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DIDResultTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DIDResultTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DTCTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DTCTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DateTimeTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DateTimeTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DeviceInfoTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DeviceInfoTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DeviceStatusTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DeviceStatusTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DisplayCapabilitiesTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DisplayCapabilitiesTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ECallInfoTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ECallInfoTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/EmergencyEventTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/EmergencyEventTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/EqualizerSettingsTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/EqualizerSettingsTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/FuelRangeTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/FuelRangeTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/GPSDataTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/GPSDataTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMICapabilitiesTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMICapabilitiesTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMIPermissionsTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMIPermissionsTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMISettingsControlCapabilitiesTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMISettingsControlCapabilitiesTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMISettingsControlDataTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMISettingsControlDataTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HapticRectTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HapticRectTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HeadLampStatusTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HeadLampStatusTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HeadersTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HeadersTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ImageFieldTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ImageFieldTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ImageResolutionTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ImageResolutionTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ImageTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ImageTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/KeyboardPropertiesTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/KeyboardPropertiesTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LightCapabilitiesTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LightCapabilitiesTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LightControlCapabilitiesTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LightControlCapabilitiesTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LightControlDataTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LightControlDataTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LightStateTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LightStateTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LocationDetailsTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LocationDetailsTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MassageCushionFirmnessTest.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MassageCushionFirmnessTest.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MassageModeDataTest.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MassageModeDataTest.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MediaServiceDataTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MediaServiceDataTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MediaServiceManifestTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MediaServiceManifestTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MenuParamsTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MenuParamsTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MetadataTagsTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MetadataTagsTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ModuleDataTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ModuleDataTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MyKeyTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MyKeyTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/NavigationCapabilityTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/NavigationCapabilityTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/NavigationInstructionTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/NavigationInstructionTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/NavigationServiceDataTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/NavigationServiceDataTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/NavigationServiceManifestTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/NavigationServiceManifestTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/OasisAddressTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/OasisAddressTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ParameterPermissionsTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ParameterPermissionsTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/PermissionItemTest.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/PermissionItemTest.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/PhoneCapabilityTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/PhoneCapabilityTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/PresetBankCapabilitiesTest.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/PresetBankCapabilitiesTest.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RGBColorTest.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RGBColorTest.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RadioControlCapabilitiesTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RadioControlCapabilitiesTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RadioControlDataTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RadioControlDataTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RdsDataTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RdsDataTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RectangleTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RectangleTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RemoteControlCapabilitiesTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RemoteControlCapabilitiesTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ScreenParamsTest.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ScreenParamsTest.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SdlMsgVersionTest.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SdlMsgVersionTest.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatControlCapabilitiesTest.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatControlCapabilitiesTest.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatControlDataTest.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatControlDataTest.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatMemoryActionTest.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatMemoryActionTest.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SingleTireStatusTest.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SingleTireStatusTest.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SisDataTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SisDataTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SoftButtonCapabilitiesTest.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SoftButtonCapabilitiesTest.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SoftButtonTest.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SoftButtonTest.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/StartTimeTest.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/StartTimeTest.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/StationIDNumberTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/StationIDNumberTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SystemCapabilityTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SystemCapabilityTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TTSChunkTest.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TTSChunkTest.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TemperatureTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TemperatureTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TemplateColorSchemeTest.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TemplateColorSchemeTest.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TextFieldTest.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TextFieldTest.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TireStatusTest.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TireStatusTest.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TouchCoordTest.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TouchCoordTest.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TouchEventCapabilitiesTest.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TouchEventCapabilitiesTest.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TouchEventTest.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TouchEventTest.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TurnTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TurnTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VehicleDataResultTest.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VehicleDataResultTest.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VehicleTypeTest.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VehicleTypeTest.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VideoStreamingCapabilityTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VideoStreamingCapabilityTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VideoStreamingFormatTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VideoStreamingFormatTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VrHelpItemTest.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VrHelpItemTest.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WeatherAlertTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WeatherAlertTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WeatherDataTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WeatherDataTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WeatherServiceDataTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WeatherServiceDataTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WeatherServiceManifestTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WeatherServiceManifestTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AmbientLightStatusTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AmbientLightStatusTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AppHmiTypeTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AppHmiTypeTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AppInterfaceUnregisteredReasonTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AppInterfaceUnregisteredReasonTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AppServiceTypeTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AppServiceTypeTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AudioStreamingIndicatorTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AudioStreamingIndicatorTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AudioStreamingStateTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AudioStreamingStateTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AudioTypeTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AudioTypeTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/BitsPerSampleTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/BitsPerSampleTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ButtonEventModeTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ButtonEventModeTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ButtonNameTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ButtonNameTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ButtonPressModeTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ButtonPressModeTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/CarModeStatusTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/CarModeStatusTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/CharacterSetTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/CharacterSetTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/CompassDirectionTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/CompassDirectionTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ComponentVolumeStatusTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ComponentVolumeStatusTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DefrostZoneTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DefrostZoneTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DeviceLevelStatusTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DeviceLevelStatusTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DimensionTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DimensionTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DirectionTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DirectionTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DisplayModeTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DisplayModeTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DisplayTypeTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DisplayTypeTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DistanceUnitTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DistanceUnitTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DriverDistractionStateTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DriverDistractionStateTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ECallConfirmationStatusTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ECallConfirmationStatusTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ElectronicParkBrakeStatusTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ElectronicParkBrakeStatusTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/EmergencyEventTypeTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/EmergencyEventTypeTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/FileTypeTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/FileTypeTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/FuelCutoffStatusTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/FuelCutoffStatusTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/FuelTypeTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/FuelTypeTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/GlobalPropertyTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/GlobalPropertyTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/HmiLevelTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/HmiLevelTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/HmiZoneCapabilitiesTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/HmiZoneCapabilitiesTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/HybridAppPreferenceTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/HybridAppPreferenceTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/IgnitionStableStatusTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/IgnitionStableStatusTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/IgnitionStatusTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/IgnitionStatusTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ImageFieldNameTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ImageFieldNameTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ImageTypeTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ImageTypeTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/InteractionModeTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/InteractionModeTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/JingleTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/JingleTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/KeyboardEventTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/KeyboardEventTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/KeyboardLayoutTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/KeyboardLayoutTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/KeypressModeTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/KeypressModeTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LanguageTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LanguageTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LayoutModeTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LayoutModeTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LightNameTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LightNameTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LightStatusTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LightStatusTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LockScreenStatusTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LockScreenStatusTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MassageCushionTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MassageCushionTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MassageModeTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MassageModeTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MassageZoneTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MassageZoneTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MediaClockFormatTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MediaClockFormatTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MediaTypeTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MediaTypeTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MetadataTypeTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MetadataTypeTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ModuleTypeTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ModuleTypeTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/NavigationActionTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/NavigationActionTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/NavigationJunctionTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/NavigationJunctionTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PowerModeQualificationStatusTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PowerModeQualificationStatusTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PowerModeStatusTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PowerModeStatusTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PredefinedLayoutTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PredefinedLayoutTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PrerecordedSpeechTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PrerecordedSpeechTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PrimaryAudioSourceTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PrimaryAudioSourceTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PrndlTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PrndlTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/RadioBandTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/RadioBandTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/RadioStateTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/RadioStateTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/RequestTypeTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/RequestTypeTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ResultTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ResultTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SamplingRateTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SamplingRateTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SdlDisconnectedReasonTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SdlDisconnectedReasonTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SeatMemoryActionTypeTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SeatMemoryActionTypeTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ServiceUpdateReasonTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ServiceUpdateReasonTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SoftButtonTypeTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SoftButtonTypeTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SpeechCapabilitiesTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SpeechCapabilitiesTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/StaticIconNameTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/StaticIconNameTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SupportedSeatTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SupportedSeatTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SystemActionTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SystemActionTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SystemCapabilityTypeTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SystemCapabilityTypeTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SystemContextTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SystemContextTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TPMSTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TPMSTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TbtStateTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TbtStateTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TextAlignmentTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TextAlignmentTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TextFieldNameTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TextFieldNameTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TouchTypeTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TouchTypeTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TriggerSourceTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TriggerSourceTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TurnSignalTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TurnSignalTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/UpdateModeTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/UpdateModeTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataEventStatusTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataEventStatusTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataNotificationStatusTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataNotificationStatusTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataResultCodeTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataResultCodeTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataStatusTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataStatusTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataTypeTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataTypeTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VentilationModeTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VentilationModeTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VideoStreamingCodecTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VideoStreamingCodecTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VideoStreamingProtocolTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VideoStreamingProtocolTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VideoStreamingStateTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VideoStreamingStateTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VrCapabilitiesTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VrCapabilitiesTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/WarningLightStatusTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/WarningLightStatusTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/WiperStatusTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/WiperStatusTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnAppInterfaceUnregisteredTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnAppInterfaceUnregisteredTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnAppServiceDataTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnAppServiceDataTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnAudioPassThruTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnAudioPassThruTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnButtonEventTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnButtonEventTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnButtonPressTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnButtonPressTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnCommandTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnCommandTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnDriverDistractionTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnDriverDistractionTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnErrorTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnErrorTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnHMIStatusTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnHMIStatusTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnHashChangeTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnHashChangeTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnInteriorVehicleDataTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnInteriorVehicleDataTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnKeyboardInputTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnKeyboardInputTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnLanguageChangeTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnLanguageChangeTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnLockScreenStatusTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnLockScreenStatusTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnPermissionsChangeTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnPermissionsChangeTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnProxyClosedTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnProxyClosedTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnProxyOpenedTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnProxyOpenedTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnRCStatusTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnRCStatusTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnSdlChoiceChosenTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnSdlChoiceChosenTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnStreamRPCTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnStreamRPCTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnSystemCapabilityUpdatedTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnSystemCapabilityUpdatedTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnSystemRequestTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnSystemRequestTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnTBTClientStateTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnTBTClientStateTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnTouchEventTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnTouchEventTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnVehicleDataTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnVehicleDataTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnWayPointChangeTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnWayPointChangeTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AddCommandTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AddCommandTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AddSubmenuTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AddSubmenuTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AlertManeuverTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AlertManeuverTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AlertTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AlertTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ButtonPressTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ButtonPressTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ChangeRegistrationTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ChangeRegistrationTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/CreateInteractionChoiceSetTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/CreateInteractionChoiceSetTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteCommandTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteCommandTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteFileTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteFileTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteInteractionChoiceSetTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteInteractionChoiceSetTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteSubMenuTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteSubMenuTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DiagnosticMessageTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DiagnosticMessageTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DialNumberTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DialNumberTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/EndAudioPassThruTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/EndAudioPassThruTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetAppServiceDataTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetAppServiceDataTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetCloudAppPropertiesTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetCloudAppPropertiesTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetDTCsTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetDTCsTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetFileTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetFileTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetInteriorVehicleDataTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetInteriorVehicleDataTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetSystemCapabilityTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetSystemCapabilityTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetVehicleDataTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetVehicleDataTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetWayPointsTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetWayPointsTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ListFilesTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ListFilesTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformAppServiceInteractionTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformAppServiceInteractionTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformAudioPassThruTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformAudioPassThruTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformInteractionTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformInteractionTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PublishAppServiceTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PublishAppServiceTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PutFileTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PutFileTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ReadDidTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ReadDidTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/RegisterAppInterfaceTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/RegisterAppInterfaceTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ResetGlobalPropertiesTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ResetGlobalPropertiesTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ScrollableMessageTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ScrollableMessageTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SendHapticDataTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SendHapticDataTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SendLocationTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SendLocationTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetAppIconTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetAppIconTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetCloudAppPropertiesTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetCloudAppPropertiesTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetDisplayLayoutTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetDisplayLayoutTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetGlobalPropertiesTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetGlobalPropertiesTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetInteriorVehicleDataTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetInteriorVehicleDataTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetMediaClockTimerTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetMediaClockTimerTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ShowConstantTbtTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ShowConstantTbtTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ShowTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ShowTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SliderTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SliderTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SpeakTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SpeakTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeButtonTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeButtonTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeVehicleDataTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeVehicleDataTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeWayPointsTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeWayPointsTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SystemRequestTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SystemRequestTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnregisterAppInterfaceTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnregisterAppInterfaceTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeButtonTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeButtonTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeVehicleDataTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeVehicleDataTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeWayPointsTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeWayPointsTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UpdateTurnListTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UpdateTurnListTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AddCommandResponseTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AddCommandResponseTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AddSubmenuResponseTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AddSubmenuResponseTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AlertManeuverResponseTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AlertManeuverResponseTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AlertResponseTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AlertResponseTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ButtonPressResponseTest.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ButtonPressResponseTest.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ChangeRegistrationResponseTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ChangeRegistrationResponseTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/CreateInteractionChoiceSetResponseTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/CreateInteractionChoiceSetResponseTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteCommandResponseTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteCommandResponseTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteFileResponseTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteFileResponseTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteInteractionChoiceSetResponseTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteInteractionChoiceSetResponseTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteSubMenuResponseTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteSubMenuResponseTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DiagnosticMessageResponseTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DiagnosticMessageResponseTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DialNumberResponseTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DialNumberResponseTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/EndAudioPassThruResponseTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/EndAudioPassThruResponseTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GenericResponseTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GenericResponseTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetAppServiceDataResponseTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetAppServiceDataResponseTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetCloudAppPropertiesResponseTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetCloudAppPropertiesResponseTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetDTCsResponseTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetDTCsResponseTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetFileResponseTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetFileResponseTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetInteriorVehicleDataResponseTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetInteriorVehicleDataResponseTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetSystemCapabilityResponseTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetSystemCapabilityResponseTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetVehicleDataResponseTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetVehicleDataResponseTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetWayPointsResponseTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetWayPointsResponseTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ListFilesResponseTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ListFilesResponseTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PerformAppServiceInteractionResponseTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PerformAppServiceInteractionResponseTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PerformAudioPassThruResponseTest.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PerformAudioPassThruResponseTest.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PerformInteractionResponseTest.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PerformInteractionResponseTest.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PublishAppServiceResponseTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PublishAppServiceResponseTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PutFileResponseTest.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PutFileResponseTest.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ReadDIDResponseTest.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ReadDIDResponseTest.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/RegisterAppInterfaceResponseTest.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/RegisterAppInterfaceResponseTest.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ResetGlobalPropertiesResponseTest.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ResetGlobalPropertiesResponseTest.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ScrollableMessageResponseTest.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ScrollableMessageResponseTest.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SendLocationResponseTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SendLocationResponseTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetAppIconResponseTest.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetAppIconResponseTest.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetCloudAppPropertiesResponseTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetCloudAppPropertiesResponseTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetDisplayLayoutResponseTest.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetDisplayLayoutResponseTest.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetGlobalPropertiesResponseTest.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetGlobalPropertiesResponseTest.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetInteriorVehicleDataResponseTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetInteriorVehicleDataResponseTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetMediaClockTimerResponseTest.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetMediaClockTimerResponseTest.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ShowConstantTbtResponseTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ShowConstantTbtResponseTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ShowResponseTest.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ShowResponseTest.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SliderResponseTest.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SliderResponseTest.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SpeakResponseTest.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SpeakResponseTest.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/StreamRPCResponseTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/StreamRPCResponseTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeButtonResponseTest.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeButtonResponseTest.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeVehicleDataResponseTest.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeVehicleDataResponseTest.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeWaypointsResponseTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeWaypointsResponseTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SystemRequestResponseTest.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SystemRequestResponseTest.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnregisterAppInterfaceResponseTest.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnregisterAppInterfaceResponseTest.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeButtonResponseTest.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeButtonResponseTest.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeVehicleDataResponseTest.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeVehicleDataResponseTest.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeWayPointsResponseTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeWayPointsResponseTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UpdateTurnListResponseTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UpdateTurnListResponseTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/security/SdlSecurityBaseTest.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/security/SdlSecurityBaseTest.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/AbstractPacketizerTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/AbstractPacketizerTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/MockInterfaceBroker.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/MockInterfaceBroker.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/MockPacketizer.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/MockPacketizer.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/MockStreamListener.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/MockStreamListener.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/StreamPacketizerTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/StreamPacketizerTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/StreamRPCPacketizerTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/StreamRPCPacketizerTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/video/RTPH264PacketizerTest.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/video/RTPH264PacketizerTest.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/video/SdlRemoteDisplayTest.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/video/SdlRemoteDisplayTest.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/DiagLevelTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/DiagLevelTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/MimeTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/MimeTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/SdlTraceTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/SdlTraceTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/enums/DetailLevelTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/enums/DetailLevelTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/enums/InterfaceActivityDirectionTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/enums/InterfaceActivityDirectionTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/enums/ModTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/enums/ModTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/BTTransportConfigTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/BTTransportConfigTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/BaseTransportConfigTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/BaseTransportConfigTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/MultiplexBluetoothTransportTest.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/MultiplexBluetoothTransportTest.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/MultiplexTransportConfigTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/MultiplexTransportConfigTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/SdlPsmTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/SdlPsmTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/TCPTransportConfigTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/TCPTransportConfigTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/TransportTypeTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/TransportTypeTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/WiFiSocketFactoryTest.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/WiFiSocketFactoryTest.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/BitConverterTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/util/BitConverterTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/ByteEnumerTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/util/ByteEnumerTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/DebugToolTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/util/DebugToolTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/DeviceUtil.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/util/DeviceUtil.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/NativeLogToolTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/util/NativeLogToolTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/SdlAppInfoTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/util/SdlAppInfoTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/SdlDataTypeConverterTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/util/SdlDataTypeConverterTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/VersionTest.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/util/VersionTest.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/utl/AndroidToolsTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/test/utl/AndroidToolsTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/LocalRouterServiceTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/transport/LocalRouterServiceTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/MultiplexTransportTest.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/transport/MultiplexTransportTest.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/RSVTestCase.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/transport/RSVTestCase.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/RegisteredAppTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/transport/RegisteredAppTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/SdlRouterServiceTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/transport/SdlRouterServiceTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/TransportBrokerTest.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/transport/TransportBrokerTest.java)0
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/TransportManagerTests.java (renamed from sdl_android/src/androidTest/java/com/smartdevicelink/transport/TransportManagerTests.java)0
-rw-r--r--android/sdl_android/src/androidTest/res/raw/test_audio_square_250hz_80amp_1s.mp3 (renamed from sdl_android/src/androidTest/res/raw/test_audio_square_250hz_80amp_1s.mp3)bin18803 -> 18803 bytes
-rw-r--r--android/sdl_android/src/main/AndroidManifest.xml (renamed from sdl_android/src/main/AndroidManifest.xml)0
-rw-r--r--android/sdl_android/src/main/aidl/com/smartdevicelink/protocol/SdlPacket.aidl (renamed from sdl_android/src/main/aidl/com/smartdevicelink/protocol/SdlPacket.aidl)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/Dispatcher/IDispatchingStrategy.java (renamed from sdl_android/src/main/java/com/smartdevicelink/Dispatcher/IDispatchingStrategy.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/Dispatcher/ProxyMessageDispatcher.java (renamed from sdl_android/src/main/java/com/smartdevicelink/Dispatcher/ProxyMessageDispatcher.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/SdlConnection/ISdlConnectionListener.java (renamed from sdl_android/src/main/java/com/smartdevicelink/SdlConnection/ISdlConnectionListener.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/SdlConnection/SdlConnection.java (renamed from sdl_android/src/main/java/com/smartdevicelink/SdlConnection/SdlConnection.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/SdlConnection/SdlSession.java (renamed from sdl_android/src/main/java/com/smartdevicelink/SdlConnection/SdlSession.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/SdlConnection/SdlSession2.java (renamed from sdl_android/src/main/java/com/smartdevicelink/SdlConnection/SdlSession2.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/encoder/EncoderUtils.java (renamed from sdl_android/src/main/java/com/smartdevicelink/encoder/EncoderUtils.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/encoder/SdlEncoder.java (renamed from sdl_android/src/main/java/com/smartdevicelink/encoder/SdlEncoder.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/encoder/VirtualDisplayEncoder.java (renamed from sdl_android/src/main/java/com/smartdevicelink/encoder/VirtualDisplayEncoder.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/exception/SdlException.java (renamed from sdl_android/src/main/java/com/smartdevicelink/exception/SdlException.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/exception/SdlExceptionCause.java (renamed from sdl_android/src/main/java/com/smartdevicelink/exception/SdlExceptionCause.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/haptic/HapticInterfaceManager.java (renamed from sdl_android/src/main/java/com/smartdevicelink/haptic/HapticInterfaceManager.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/managers/BaseSubManager.java (renamed from sdl_android/src/main/java/com/smartdevicelink/managers/BaseSubManager.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/managers/CompletionListener.java (renamed from sdl_android/src/main/java/com/smartdevicelink/managers/CompletionListener.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/managers/ProxyBridge.java (renamed from sdl_android/src/main/java/com/smartdevicelink/managers/ProxyBridge.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManager.java (renamed from sdl_android/src/main/java/com/smartdevicelink/managers/SdlManager.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManagerListener.java (renamed from sdl_android/src/main/java/com/smartdevicelink/managers/SdlManagerListener.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/managers/StreamingStateMachine.java (renamed from sdl_android/src/main/java/com/smartdevicelink/managers/StreamingStateMachine.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioDecoder.java (renamed from sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioDecoder.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioDecoderCompat.java (renamed from sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioDecoderCompat.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioDecoderListener.java (renamed from sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioDecoderListener.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioStreamManager.java (renamed from sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioStreamManager.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/BaseAudioDecoder.java (renamed from sdl_android/src/main/java/com/smartdevicelink/managers/audio/BaseAudioDecoder.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/SampleBuffer.java (renamed from sdl_android/src/main/java/com/smartdevicelink/managers/audio/SampleBuffer.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/managers/file/FileManager.java (renamed from sdl_android/src/main/java/com/smartdevicelink/managers/file/FileManager.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/managers/file/MultipleFileCompletionListener.java (renamed from sdl_android/src/main/java/com/smartdevicelink/managers/file/MultipleFileCompletionListener.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlArtwork.java (renamed from sdl_android/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlArtwork.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlFile.java (renamed from sdl_android/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlFile.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/managers/lifecycle/RpcConverter.java (renamed from sdl_android/src/main/java/com/smartdevicelink/managers/lifecycle/RpcConverter.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenConfig.java (renamed from sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenConfig.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenManager.java (renamed from sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenManager.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/SDLLockScreenActivity.java (renamed from sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/SDLLockScreenActivity.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/managers/permission/OnPermissionChangeListener.java (renamed from sdl_android/src/main/java/com/smartdevicelink/managers/permission/OnPermissionChangeListener.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/managers/permission/PermissionElement.java (renamed from sdl_android/src/main/java/com/smartdevicelink/managers/permission/PermissionElement.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/managers/permission/PermissionFilter.java (renamed from sdl_android/src/main/java/com/smartdevicelink/managers/permission/PermissionFilter.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/managers/permission/PermissionManager.java (renamed from sdl_android/src/main/java/com/smartdevicelink/managers/permission/PermissionManager.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/managers/permission/PermissionStatus.java (renamed from sdl_android/src/main/java/com/smartdevicelink/managers/permission/PermissionStatus.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/ScreenManager.java (renamed from sdl_android/src/main/java/com/smartdevicelink/managers/screen/ScreenManager.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/SoftButtonManager.java (renamed from sdl_android/src/main/java/com/smartdevicelink/managers/screen/SoftButtonManager.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/SoftButtonObject.java (renamed from sdl_android/src/main/java/com/smartdevicelink/managers/screen/SoftButtonObject.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/SoftButtonState.java (renamed from sdl_android/src/main/java/com/smartdevicelink/managers/screen/SoftButtonState.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/TextAndGraphicManager.java (renamed from sdl_android/src/main/java/com/smartdevicelink/managers/screen/TextAndGraphicManager.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/managers/video/VideoStreamManager.java (renamed from sdl_android/src/main/java/com/smartdevicelink/managers/video/VideoStreamManager.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/marshal/JsonRPCMarshaller.java (renamed from sdl_android/src/main/java/com/smartdevicelink/marshal/JsonRPCMarshaller.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/protocol/AbstractProtocol.java (renamed from sdl_android/src/main/java/com/smartdevicelink/protocol/AbstractProtocol.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/protocol/BinaryFrameHeader.java (renamed from sdl_android/src/main/java/com/smartdevicelink/protocol/BinaryFrameHeader.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/protocol/IProtocolListener.java (renamed from sdl_android/src/main/java/com/smartdevicelink/protocol/IProtocolListener.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/protocol/ISdlProtocol.java (renamed from sdl_android/src/main/java/com/smartdevicelink/protocol/ISdlProtocol.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/protocol/ISecondaryTransportListener.java (renamed from sdl_android/src/main/java/com/smartdevicelink/protocol/ISecondaryTransportListener.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/protocol/ProtocolMessage.java (renamed from sdl_android/src/main/java/com/smartdevicelink/protocol/ProtocolMessage.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlPacket.java (renamed from sdl_android/src/main/java/com/smartdevicelink/protocol/SdlPacket.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlPacketFactory.java (renamed from sdl_android/src/main/java/com/smartdevicelink/protocol/SdlPacketFactory.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlProtocol.java (renamed from sdl_android/src/main/java/com/smartdevicelink/protocol/SdlProtocol.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/protocol/WiProProtocol.java (renamed from sdl_android/src/main/java/com/smartdevicelink/protocol/WiProProtocol.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/protocol/enums/ControlFrameTags.java (renamed from sdl_android/src/main/java/com/smartdevicelink/protocol/enums/ControlFrameTags.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/protocol/enums/FrameData.java (renamed from sdl_android/src/main/java/com/smartdevicelink/protocol/enums/FrameData.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/protocol/enums/FrameDataControlFrameType.java (renamed from sdl_android/src/main/java/com/smartdevicelink/protocol/enums/FrameDataControlFrameType.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/protocol/enums/FrameType.java (renamed from sdl_android/src/main/java/com/smartdevicelink/protocol/enums/FrameType.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/protocol/enums/FunctionID.java (renamed from sdl_android/src/main/java/com/smartdevicelink/protocol/enums/FunctionID.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/protocol/enums/MessageType.java (renamed from sdl_android/src/main/java/com/smartdevicelink/protocol/enums/MessageType.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/protocol/enums/SessionType.java (renamed from sdl_android/src/main/java/com/smartdevicelink/protocol/enums/SessionType.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/protocol/heartbeat/HeartbeatMonitor.java (renamed from sdl_android/src/main/java/com/smartdevicelink/protocol/heartbeat/HeartbeatMonitor.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/protocol/heartbeat/IHeartbeatMonitor.java (renamed from sdl_android/src/main/java/com/smartdevicelink/protocol/heartbeat/IHeartbeatMonitor.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/protocol/heartbeat/IHeartbeatMonitorListener.java (renamed from sdl_android/src/main/java/com/smartdevicelink/protocol/heartbeat/IHeartbeatMonitorListener.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/IProxyListener.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/IProxyListener.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/LockScreenManager.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/LockScreenManager.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCMessage.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/RPCMessage.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCNotification.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/RPCNotification.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCRequest.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/RPCRequest.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCRequestFactory.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/RPCRequestFactory.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCResponse.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/RPCResponse.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCStreamController.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/RPCStreamController.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCStruct.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/RPCStruct.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyALM.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyALM.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBuilder.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBuilder.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyConfigurationResources.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyConfigurationResources.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/SystemCapabilityManager.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/SystemCapabilityManager.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/TTSChunkFactory.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/TTSChunkFactory.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/Version.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/Version.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/callbacks/InternalProxyMessage.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/callbacks/InternalProxyMessage.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/callbacks/OnError.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/callbacks/OnError.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/callbacks/OnProxyClosed.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/callbacks/OnProxyClosed.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/callbacks/OnProxyOpened.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/callbacks/OnProxyOpened.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/callbacks/OnServiceEnded.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/callbacks/OnServiceEnded.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/callbacks/OnServiceNACKed.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/callbacks/OnServiceNACKed.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/constants/Jingles.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/constants/Jingles.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/constants/Names.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/constants/Names.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/IAudioStreamListener.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/IAudioStreamListener.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/IProxyListenerALM.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/IProxyListenerALM.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/IProxyListenerBase.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/IProxyListenerBase.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/IPutFileResponseListener.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/IPutFileResponseListener.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/ISdl.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/ISdl.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/ISdlServiceListener.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/ISdlServiceListener.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/IVideoStreamListener.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/IVideoStreamListener.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/OnSystemCapabilityListener.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/OnSystemCapabilityListener.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AddCommand.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AddCommand.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AddCommandResponse.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AddCommandResponse.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AddSubMenu.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AddSubMenu.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AddSubMenuResponse.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AddSubMenuResponse.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AirbagStatus.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AirbagStatus.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Alert.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Alert.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AlertManeuver.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AlertManeuver.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AlertManeuverResponse.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AlertManeuverResponse.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AlertResponse.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AlertResponse.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AppServiceCapability.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AppServiceCapability.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AppServiceData.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AppServiceData.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AppServiceManifest.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AppServiceManifest.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AppServiceRecord.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AppServiceRecord.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AppServicesCapabilities.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AppServicesCapabilities.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AudioControlCapabilities.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AudioControlCapabilities.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AudioControlData.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AudioControlData.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AudioPassThruCapabilities.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AudioPassThruCapabilities.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/BeltStatus.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/BeltStatus.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/BodyInformation.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/BodyInformation.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ButtonCapabilities.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ButtonCapabilities.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ButtonPress.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ButtonPress.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ButtonPressResponse.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ButtonPressResponse.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ChangeRegistration.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ChangeRegistration.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ChangeRegistrationResponse.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ChangeRegistrationResponse.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Choice.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Choice.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ClimateControlCapabilities.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ClimateControlCapabilities.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ClimateControlData.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ClimateControlData.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/CloudAppProperties.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/CloudAppProperties.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ClusterModeStatus.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ClusterModeStatus.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Coordinate.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Coordinate.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/CreateInteractionChoiceSet.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/CreateInteractionChoiceSet.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/CreateInteractionChoiceSetResponse.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/CreateInteractionChoiceSetResponse.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DIDResult.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DIDResult.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DTC.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DTC.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DateTime.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DateTime.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteCommand.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteCommand.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteCommandResponse.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteCommandResponse.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteFile.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteFile.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteFileResponse.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteFileResponse.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteInteractionChoiceSet.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteInteractionChoiceSet.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteInteractionChoiceSetResponse.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteInteractionChoiceSetResponse.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteSubMenu.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteSubMenu.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteSubMenuResponse.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteSubMenuResponse.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeviceInfo.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeviceInfo.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeviceStatus.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeviceStatus.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DiagnosticMessage.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DiagnosticMessage.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DiagnosticMessageResponse.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DiagnosticMessageResponse.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DialNumber.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DialNumber.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DialNumberResponse.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DialNumberResponse.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DisplayCapabilities.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DisplayCapabilities.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ECallInfo.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ECallInfo.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/EmergencyEvent.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/EmergencyEvent.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/EndAudioPassThru.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/EndAudioPassThru.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/EndAudioPassThruResponse.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/EndAudioPassThruResponse.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/EqualizerSettings.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/EqualizerSettings.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/FuelRange.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/FuelRange.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GPSData.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GPSData.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GenericResponse.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GenericResponse.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetAppServiceData.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetAppServiceData.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetAppServiceDataResponse.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetAppServiceDataResponse.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetCloudAppProperties.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetCloudAppProperties.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetCloudAppPropertiesResponse.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetCloudAppPropertiesResponse.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetDTCs.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetDTCs.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetDTCsResponse.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetDTCsResponse.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetFile.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetFile.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetFileResponse.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetFileResponse.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetInteriorVehicleData.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetInteriorVehicleData.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetInteriorVehicleDataResponse.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetInteriorVehicleDataResponse.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetSystemCapability.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetSystemCapability.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetSystemCapabilityResponse.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetSystemCapabilityResponse.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleData.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleData.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleDataResponse.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleDataResponse.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetWayPoints.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetWayPoints.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetWayPointsResponse.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetWayPointsResponse.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HMICapabilities.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HMICapabilities.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HMIPermissions.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HMIPermissions.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HMISettingsControlCapabilities.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HMISettingsControlCapabilities.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HMISettingsControlData.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HMISettingsControlData.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HapticRect.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HapticRect.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HeadLampStatus.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HeadLampStatus.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Headers.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Headers.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Image.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Image.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ImageField.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ImageField.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ImageResolution.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ImageResolution.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/KeyboardProperties.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/KeyboardProperties.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/LightCapabilities.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/LightCapabilities.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/LightControlCapabilities.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/LightControlCapabilities.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/LightControlData.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/LightControlData.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/LightState.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/LightState.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ListFiles.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ListFiles.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ListFilesResponse.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ListFilesResponse.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/LocationDetails.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/LocationDetails.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MassageCushionFirmness.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MassageCushionFirmness.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MassageModeData.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MassageModeData.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MediaServiceData.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MediaServiceData.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MediaServiceManifest.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MediaServiceManifest.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MenuParams.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MenuParams.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MetadataTags.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MetadataTags.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ModuleData.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ModuleData.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MyKey.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MyKey.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/NavigationCapability.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/NavigationCapability.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/NavigationInstruction.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/NavigationInstruction.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/NavigationServiceData.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/NavigationServiceData.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/NavigationServiceManifest.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/NavigationServiceManifest.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OasisAddress.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OasisAddress.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnAppInterfaceUnregistered.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnAppInterfaceUnregistered.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnAppServiceData.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnAppServiceData.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnAudioPassThru.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnAudioPassThru.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnButtonEvent.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnButtonEvent.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnButtonPress.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnButtonPress.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnCommand.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnCommand.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnDriverDistraction.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnDriverDistraction.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnHMIStatus.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnHMIStatus.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnHashChange.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnHashChange.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnInteriorVehicleData.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnInteriorVehicleData.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnKeyboardInput.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnKeyboardInput.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnLanguageChange.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnLanguageChange.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnLockScreenStatus.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnLockScreenStatus.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnPermissionsChange.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnPermissionsChange.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnRCStatus.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnRCStatus.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnSdlChoiceChosen.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnSdlChoiceChosen.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnStreamRPC.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnStreamRPC.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnSystemCapabilityUpdated.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnSystemCapabilityUpdated.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnSystemRequest.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnSystemRequest.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnTBTClientState.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnTBTClientState.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnTouchEvent.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnTouchEvent.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnVehicleData.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnVehicleData.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnWayPointChange.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnWayPointChange.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ParameterPermissions.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ParameterPermissions.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformAppServiceInteraction.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformAppServiceInteraction.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformAppServiceInteractionResponse.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformAppServiceInteractionResponse.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformAudioPassThru.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformAudioPassThru.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformAudioPassThruResponse.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformAudioPassThruResponse.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformInteraction.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformInteraction.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformInteractionResponse.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformInteractionResponse.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PermissionItem.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PermissionItem.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PhoneCapability.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PhoneCapability.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PresetBankCapabilities.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PresetBankCapabilities.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PublishAppService.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PublishAppService.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PublishAppServiceResponse.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PublishAppServiceResponse.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PutFile.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PutFile.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PutFileResponse.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PutFileResponse.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RGBColor.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RGBColor.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RadioControlCapabilities.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RadioControlCapabilities.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RadioControlData.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RadioControlData.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RdsData.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RdsData.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ReadDID.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ReadDID.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ReadDIDResponse.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ReadDIDResponse.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Rectangle.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Rectangle.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RegisterAppInterface.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RegisterAppInterface.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RegisterAppInterfaceResponse.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RegisterAppInterfaceResponse.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RemoteControlCapabilities.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RemoteControlCapabilities.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ResetGlobalProperties.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ResetGlobalProperties.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ResetGlobalPropertiesResponse.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ResetGlobalPropertiesResponse.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ScreenParams.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ScreenParams.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ScrollableMessage.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ScrollableMessage.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ScrollableMessageResponse.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ScrollableMessageResponse.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SdlMsgVersion.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SdlMsgVersion.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SeatControlCapabilities.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SeatControlCapabilities.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SeatControlData.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SeatControlData.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SeatMemoryAction.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SeatMemoryAction.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SendHapticData.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SendHapticData.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SendHapticDataResponse.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SendHapticDataResponse.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SendLocation.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SendLocation.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SendLocationResponse.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SendLocationResponse.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetAppIcon.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetAppIcon.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetAppIconResponse.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetAppIconResponse.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetCloudAppProperties.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetCloudAppProperties.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetCloudAppPropertiesResponse.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetCloudAppPropertiesResponse.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetDisplayLayout.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetDisplayLayout.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetDisplayLayoutResponse.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetDisplayLayoutResponse.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetGlobalProperties.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetGlobalProperties.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetGlobalPropertiesResponse.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetGlobalPropertiesResponse.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetInteriorVehicleData.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetInteriorVehicleData.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetInteriorVehicleDataResponse.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetInteriorVehicleDataResponse.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetMediaClockTimer.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetMediaClockTimer.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetMediaClockTimerResponse.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetMediaClockTimerResponse.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Show.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Show.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ShowConstantTbt.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ShowConstantTbt.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ShowConstantTbtResponse.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ShowConstantTbtResponse.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ShowResponse.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ShowResponse.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SingleTireStatus.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SingleTireStatus.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SisData.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SisData.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Slider.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Slider.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SliderResponse.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SliderResponse.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SoftButton.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SoftButton.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SoftButtonCapabilities.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SoftButtonCapabilities.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Speak.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Speak.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SpeakResponse.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SpeakResponse.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/StartTime.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/StartTime.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/StationIDNumber.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/StationIDNumber.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/StreamRPCResponse.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/StreamRPCResponse.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeButton.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeButton.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeButtonResponse.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeButtonResponse.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleData.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleData.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleDataResponse.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleDataResponse.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeWayPoints.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeWayPoints.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeWayPointsResponse.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeWayPointsResponse.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SystemCapability.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SystemCapability.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SystemRequest.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SystemRequest.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SystemRequestResponse.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SystemRequestResponse.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TTSChunk.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TTSChunk.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Temperature.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Temperature.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TemplateColorScheme.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TemplateColorScheme.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TextField.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TextField.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TireStatus.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TireStatus.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TouchCoord.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TouchCoord.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TouchEvent.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TouchEvent.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TouchEventCapabilities.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TouchEventCapabilities.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Turn.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Turn.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnregisterAppInterface.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnregisterAppInterface.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnregisterAppInterfaceResponse.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnregisterAppInterfaceResponse.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeButton.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeButton.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeButtonResponse.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeButtonResponse.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleData.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleData.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleDataResponse.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleDataResponse.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeWayPoints.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeWayPoints.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeWayPointsResponse.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeWayPointsResponse.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UpdateTurnList.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UpdateTurnList.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UpdateTurnListResponse.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UpdateTurnListResponse.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VehicleDataResult.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VehicleDataResult.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VehicleType.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VehicleType.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VideoStreamingCapability.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VideoStreamingCapability.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VideoStreamingFormat.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VideoStreamingFormat.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VrHelpItem.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VrHelpItem.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/WeatherAlert.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/WeatherAlert.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/WeatherData.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/WeatherData.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/WeatherServiceData.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/WeatherServiceData.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/WeatherServiceManifest.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/WeatherServiceManifest.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AmbientLightStatus.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AmbientLightStatus.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AppHMIType.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AppHMIType.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AppInterfaceUnregisteredReason.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AppInterfaceUnregisteredReason.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AppServiceType.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AppServiceType.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AudioStreamingIndicator.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AudioStreamingIndicator.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AudioStreamingState.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AudioStreamingState.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AudioType.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AudioType.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/BitsPerSample.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/BitsPerSample.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ButtonEventMode.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ButtonEventMode.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ButtonName.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ButtonName.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ButtonPressMode.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ButtonPressMode.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/CarModeStatus.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/CarModeStatus.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/CharacterSet.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/CharacterSet.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/CompassDirection.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/CompassDirection.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ComponentVolumeStatus.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ComponentVolumeStatus.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/DefrostZone.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/DefrostZone.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/DeliveryMode.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/DeliveryMode.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/DeviceLevelStatus.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/DeviceLevelStatus.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/Dimension.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/Dimension.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/Direction.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/Direction.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/DisplayMode.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/DisplayMode.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/DisplayType.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/DisplayType.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/DistanceUnit.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/DistanceUnit.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/DriverDistractionState.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/DriverDistractionState.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ECallConfirmationStatus.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ECallConfirmationStatus.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ElectronicParkBrakeStatus.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ElectronicParkBrakeStatus.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/EmergencyEventType.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/EmergencyEventType.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/FileType.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/FileType.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/FuelCutoffStatus.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/FuelCutoffStatus.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/FuelType.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/FuelType.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/GlobalProperty.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/GlobalProperty.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/HMILevel.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/HMILevel.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/HmiZoneCapabilities.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/HmiZoneCapabilities.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/HybridAppPreference.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/HybridAppPreference.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/IgnitionStableStatus.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/IgnitionStableStatus.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/IgnitionStatus.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/IgnitionStatus.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ImageFieldName.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ImageFieldName.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ImageType.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ImageType.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/InteractionMode.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/InteractionMode.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/Jingle.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/Jingle.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/KeyboardEvent.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/KeyboardEvent.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/KeyboardLayout.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/KeyboardLayout.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/KeypressMode.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/KeypressMode.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/Language.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/Language.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/LayoutMode.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/LayoutMode.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/LightName.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/LightName.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/LightStatus.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/LightStatus.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/LockScreenStatus.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/LockScreenStatus.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/MassageCushion.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/MassageCushion.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/MassageMode.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/MassageMode.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/MassageZone.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/MassageZone.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/MediaClockFormat.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/MediaClockFormat.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/MediaType.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/MediaType.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/MetadataType.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/MetadataType.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ModuleType.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ModuleType.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/NavigationAction.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/NavigationAction.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/NavigationJunction.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/NavigationJunction.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/PRNDL.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/PRNDL.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/PowerModeQualificationStatus.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/PowerModeQualificationStatus.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/PowerModeStatus.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/PowerModeStatus.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/PredefinedLayout.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/PredefinedLayout.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/PrerecordedSpeech.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/PrerecordedSpeech.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/PrimaryAudioSource.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/PrimaryAudioSource.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/RadioBand.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/RadioBand.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/RadioState.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/RadioState.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/RequestType.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/RequestType.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/Result.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/Result.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SamplingRate.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SamplingRate.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SdlConnectionState.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SdlConnectionState.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SdlDisconnectedReason.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SdlDisconnectedReason.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SdlInterfaceAvailability.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SdlInterfaceAvailability.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SeatMemoryActionType.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SeatMemoryActionType.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ServiceUpdateReason.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ServiceUpdateReason.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SoftButtonType.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SoftButtonType.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SpeechCapabilities.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SpeechCapabilities.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/StaticIconName.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/StaticIconName.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SupportedSeat.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SupportedSeat.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SystemAction.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SystemAction.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SystemCapabilityType.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SystemCapabilityType.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SystemContext.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SystemContext.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TBTState.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TBTState.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TPMS.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TPMS.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TemperatureUnit.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TemperatureUnit.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TextAlignment.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TextAlignment.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TextFieldName.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TextFieldName.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TouchType.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TouchType.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TriggerSource.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TriggerSource.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TurnSignal.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TurnSignal.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/UpdateMode.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/UpdateMode.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataEventStatus.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataEventStatus.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataNotificationStatus.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataNotificationStatus.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataResultCode.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataResultCode.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataStatus.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataStatus.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataType.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataType.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VentilationMode.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VentilationMode.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VideoStreamingCodec.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VideoStreamingCodec.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VideoStreamingProtocol.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VideoStreamingProtocol.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VideoStreamingState.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VideoStreamingState.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VrCapabilities.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VrCapabilities.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/WarningLightStatus.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/WarningLightStatus.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/WayPointType.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/WayPointType.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/WiperStatus.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/WiperStatus.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnMultipleRequestListener.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnMultipleRequestListener.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnPutFileUpdateListener.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnPutFileUpdateListener.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCListener.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCListener.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCNotificationListener.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCNotificationListener.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCRequestListener.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCRequestListener.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCResponseListener.java (renamed from sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCResponseListener.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/security/ISecurityInitializedListener.java (renamed from sdl_android/src/main/java/com/smartdevicelink/security/ISecurityInitializedListener.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/security/SdlSecurityBase.java (renamed from sdl_android/src/main/java/com/smartdevicelink/security/SdlSecurityBase.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/streaming/AbstractPacketizer.java (renamed from sdl_android/src/main/java/com/smartdevicelink/streaming/AbstractPacketizer.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/streaming/IStreamListener.java (renamed from sdl_android/src/main/java/com/smartdevicelink/streaming/IStreamListener.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/streaming/StreamPacketizer.java (renamed from sdl_android/src/main/java/com/smartdevicelink/streaming/StreamPacketizer.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/streaming/StreamRPCPacketizer.java (renamed from sdl_android/src/main/java/com/smartdevicelink/streaming/StreamRPCPacketizer.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/streaming/audio/AudioStreamingCodec.java (renamed from sdl_android/src/main/java/com/smartdevicelink/streaming/audio/AudioStreamingCodec.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/streaming/audio/AudioStreamingLPCMParams.java (renamed from sdl_android/src/main/java/com/smartdevicelink/streaming/audio/AudioStreamingLPCMParams.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/streaming/audio/AudioStreamingParams.java (renamed from sdl_android/src/main/java/com/smartdevicelink/streaming/audio/AudioStreamingParams.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/streaming/video/RTPH264Packetizer.java (renamed from sdl_android/src/main/java/com/smartdevicelink/streaming/video/RTPH264Packetizer.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/streaming/video/SdlRemoteDisplay.java (renamed from sdl_android/src/main/java/com/smartdevicelink/streaming/video/SdlRemoteDisplay.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/streaming/video/VideoStreamingParameters.java (renamed from sdl_android/src/main/java/com/smartdevicelink/streaming/video/VideoStreamingParameters.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/trace/DiagLevel.java (renamed from sdl_android/src/main/java/com/smartdevicelink/trace/DiagLevel.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/trace/ISTListener.java (renamed from sdl_android/src/main/java/com/smartdevicelink/trace/ISTListener.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/trace/Mime.java (renamed from sdl_android/src/main/java/com/smartdevicelink/trace/Mime.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/trace/OpenRPCMessage.java (renamed from sdl_android/src/main/java/com/smartdevicelink/trace/OpenRPCMessage.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/trace/SdlTrace.java (renamed from sdl_android/src/main/java/com/smartdevicelink/trace/SdlTrace.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/trace/TraceDeviceInfo.java (renamed from sdl_android/src/main/java/com/smartdevicelink/trace/TraceDeviceInfo.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/trace/enums/DetailLevel.java (renamed from sdl_android/src/main/java/com/smartdevicelink/trace/enums/DetailLevel.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/trace/enums/InterfaceActivityDirection.java (renamed from sdl_android/src/main/java/com/smartdevicelink/trace/enums/InterfaceActivityDirection.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/trace/enums/Mod.java (renamed from sdl_android/src/main/java/com/smartdevicelink/trace/enums/Mod.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/transport/BTTransport.java (renamed from sdl_android/src/main/java/com/smartdevicelink/transport/BTTransport.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/transport/BTTransportConfig.java (renamed from sdl_android/src/main/java/com/smartdevicelink/transport/BTTransportConfig.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/transport/BaseTransportConfig.java (renamed from sdl_android/src/main/java/com/smartdevicelink/transport/BaseTransportConfig.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/transport/ITransportListener.java (renamed from sdl_android/src/main/java/com/smartdevicelink/transport/ITransportListener.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexBaseTransport.java (renamed from sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexBaseTransport.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexBluetoothTransport.java (renamed from sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexBluetoothTransport.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexTcpTransport.java (renamed from sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexTcpTransport.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexTransport.java (renamed from sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexTransport.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexTransportConfig.java (renamed from sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexTransportConfig.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexUsbTransport.java (renamed from sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexUsbTransport.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/transport/RouterServiceValidator.java (renamed from sdl_android/src/main/java/com/smartdevicelink/transport/RouterServiceValidator.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlBroadcastReceiver.java (renamed from sdl_android/src/main/java/com/smartdevicelink/transport/SdlBroadcastReceiver.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlPsm.java (renamed from sdl_android/src/main/java/com/smartdevicelink/transport/SdlPsm.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java (renamed from sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterStatusProvider.java (renamed from sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterStatusProvider.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlTransport.java (renamed from sdl_android/src/main/java/com/smartdevicelink/transport/SdlTransport.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/transport/SiphonServer.java (renamed from sdl_android/src/main/java/com/smartdevicelink/transport/SiphonServer.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/transport/TCPTransport.java (renamed from sdl_android/src/main/java/com/smartdevicelink/transport/TCPTransport.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/transport/TCPTransportConfig.java (renamed from sdl_android/src/main/java/com/smartdevicelink/transport/TCPTransportConfig.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/transport/TransportBroker.java (renamed from sdl_android/src/main/java/com/smartdevicelink/transport/TransportBroker.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/transport/TransportConstants.java (renamed from sdl_android/src/main/java/com/smartdevicelink/transport/TransportConstants.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/transport/TransportManager.java (renamed from sdl_android/src/main/java/com/smartdevicelink/transport/TransportManager.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/transport/USBAccessoryAttachmentActivity.java (renamed from sdl_android/src/main/java/com/smartdevicelink/transport/USBAccessoryAttachmentActivity.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/transport/USBTransport.java (renamed from sdl_android/src/main/java/com/smartdevicelink/transport/USBTransport.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/transport/USBTransportConfig.java (renamed from sdl_android/src/main/java/com/smartdevicelink/transport/USBTransportConfig.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/transport/UsbTransferProvider.java (renamed from sdl_android/src/main/java/com/smartdevicelink/transport/UsbTransferProvider.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/transport/enums/TransportType.java (renamed from sdl_android/src/main/java/com/smartdevicelink/transport/enums/TransportType.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/ByteAraryMessageAssembler.java (renamed from sdl_android/src/main/java/com/smartdevicelink/transport/utl/ByteAraryMessageAssembler.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/ByteArrayMessageSpliter.java (renamed from sdl_android/src/main/java/com/smartdevicelink/transport/utl/ByteArrayMessageSpliter.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/TransportRecord.java (renamed from sdl_android/src/main/java/com/smartdevicelink/transport/utl/TransportRecord.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/WiFiSocketFactory.java (renamed from sdl_android/src/main/java/com/smartdevicelink/transport/utl/WiFiSocketFactory.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/util/AndroidTools.java (renamed from sdl_android/src/main/java/com/smartdevicelink/util/AndroidTools.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/util/BitConverter.java (renamed from sdl_android/src/main/java/com/smartdevicelink/util/BitConverter.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/util/ByteEnumer.java (renamed from sdl_android/src/main/java/com/smartdevicelink/util/ByteEnumer.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/util/CorrelationIdGenerator.java (renamed from sdl_android/src/main/java/com/smartdevicelink/util/CorrelationIdGenerator.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/util/DebugTool.java (renamed from sdl_android/src/main/java/com/smartdevicelink/util/DebugTool.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/util/HttpRequestTask.java (renamed from sdl_android/src/main/java/com/smartdevicelink/util/HttpRequestTask.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/util/HttpUtils.java (renamed from sdl_android/src/main/java/com/smartdevicelink/util/HttpUtils.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/util/IConsole.java (renamed from sdl_android/src/main/java/com/smartdevicelink/util/IConsole.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/util/NativeLogTool.java (renamed from sdl_android/src/main/java/com/smartdevicelink/util/NativeLogTool.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/util/SdlAppInfo.java (renamed from sdl_android/src/main/java/com/smartdevicelink/util/SdlAppInfo.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/util/SdlDataTypeConverter.java (renamed from sdl_android/src/main/java/com/smartdevicelink/util/SdlDataTypeConverter.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/util/ServiceFinder.java (renamed from sdl_android/src/main/java/com/smartdevicelink/util/ServiceFinder.java)0
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/util/Version.java (renamed from sdl_android/src/main/java/com/smartdevicelink/util/Version.java)0
-rw-r--r--android/sdl_android/src/main/res/drawable-hdpi/ic_sdl.png (renamed from sdl_android/src/main/res/drawable-hdpi/ic_sdl.png)bin3665 -> 3665 bytes
-rw-r--r--android/sdl_android/src/main/res/drawable-hdpi/sdl_lockscreen_icon.png (renamed from sdl_android/src/main/res/drawable-hdpi/sdl_lockscreen_icon.png)bin2570 -> 2570 bytes
-rw-r--r--android/sdl_android/src/main/res/drawable-hdpi/sdl_tray_icon.png (renamed from sdl_android/src/main/res/drawable-hdpi/sdl_tray_icon.png)bin938 -> 938 bytes
-rw-r--r--android/sdl_android/src/main/res/drawable-mdpi/ic_sdl.png (renamed from sdl_android/src/main/res/drawable-mdpi/ic_sdl.png)bin2290 -> 2290 bytes
-rw-r--r--android/sdl_android/src/main/res/drawable-mdpi/sdl_lockscreen_icon.png (renamed from sdl_android/src/main/res/drawable-mdpi/sdl_lockscreen_icon.png)bin1791 -> 1791 bytes
-rw-r--r--android/sdl_android/src/main/res/drawable-mdpi/sdl_tray_icon.png (renamed from sdl_android/src/main/res/drawable-mdpi/sdl_tray_icon.png)bin688 -> 688 bytes
-rw-r--r--android/sdl_android/src/main/res/drawable-mdpi/transparent.png (renamed from sdl_android/src/main/res/drawable-mdpi/transparent.png)bin980 -> 980 bytes
-rw-r--r--android/sdl_android/src/main/res/drawable-xhdpi/ic_sdl.png (renamed from sdl_android/src/main/res/drawable-xhdpi/ic_sdl.png)bin4759 -> 4759 bytes
-rw-r--r--android/sdl_android/src/main/res/drawable-xhdpi/sdl_lockscreen_icon.png (renamed from sdl_android/src/main/res/drawable-xhdpi/sdl_lockscreen_icon.png)bin3487 -> 3487 bytes
-rw-r--r--android/sdl_android/src/main/res/drawable-xhdpi/sdl_tray_icon.png (renamed from sdl_android/src/main/res/drawable-xhdpi/sdl_tray_icon.png)bin1211 -> 1211 bytes
-rw-r--r--android/sdl_android/src/main/res/drawable-xxhdpi/ic_sdl.png (renamed from sdl_android/src/main/res/drawable-xxhdpi/ic_sdl.png)bin7517 -> 7517 bytes
-rw-r--r--android/sdl_android/src/main/res/drawable-xxhdpi/sdl_lockscreen_icon.png (renamed from sdl_android/src/main/res/drawable-xxhdpi/sdl_lockscreen_icon.png)bin5172 -> 5172 bytes
-rw-r--r--android/sdl_android/src/main/res/drawable-xxhdpi/sdl_tray_icon.png (renamed from sdl_android/src/main/res/drawable-xxhdpi/sdl_tray_icon.png)bin2024 -> 2024 bytes
-rw-r--r--android/sdl_android/src/main/res/drawable-xxxhdpi/ic_sdl.png (renamed from sdl_android/src/main/res/drawable-xxxhdpi/ic_sdl.png)bin13699 -> 13699 bytes
-rw-r--r--android/sdl_android/src/main/res/drawable-xxxhdpi/sdl_lockscreen_icon.png (renamed from sdl_android/src/main/res/drawable-xxxhdpi/sdl_lockscreen_icon.png)bin6666 -> 6666 bytes
-rw-r--r--android/sdl_android/src/main/res/drawable-xxxhdpi/sdl_tray_icon.png (renamed from sdl_android/src/main/res/drawable-xxxhdpi/sdl_tray_icon.png)bin2594 -> 2594 bytes
-rw-r--r--android/sdl_android/src/main/res/layout/activity_sdllock_screen.xml (renamed from sdl_android/src/main/res/layout/activity_sdllock_screen.xml)0
-rw-r--r--android/sdl_android/src/main/res/values/sdl.xml (renamed from sdl_android/src/main/res/values/sdl.xml)0
-rw-r--r--android/sdl_android/src/main/res/values/strings.xml (renamed from sdl_android/src/main/res/values/strings.xml)0
-rw-r--r--android/sdl_android/src/main/res/xml/accessory_filter.xml (renamed from sdl_android/src/main/res/xml/accessory_filter.xml)0
-rw-r--r--android/sdl_android/src/test/java/com/smartdevicelink/ExampleUnitTest.java (renamed from sdl_android/src/test/java/com/smartdevicelink/ExampleUnitTest.java)0
-rw-r--r--android/sdl_android/src/test/java/com/smartdevicelink/haptic/HapticInterfaceManagerTest.java (renamed from sdl_android/src/test/java/com/smartdevicelink/haptic/HapticInterfaceManagerTest.java)0
-rw-r--r--android/settings.gradle (renamed from settings.gradle)0
-rw-r--r--android/third_party.md (renamed from third_party.md)0
1028 files changed, 0 insertions, 0 deletions
diff --git a/CHANGELOG.md b/android/CHANGELOG.md
index c1b7a2b5b..c1b7a2b5b 100644
--- a/CHANGELOG.md
+++ b/android/CHANGELOG.md
diff --git a/LICENSE b/android/LICENSE
index ddda209c2..ddda209c2 100644
--- a/LICENSE
+++ b/android/LICENSE
diff --git a/README.md b/android/README.md
index b5dad034e..b5dad034e 100644
--- a/README.md
+++ b/android/README.md
diff --git a/build.gradle b/android/build.gradle
index 800d3be0e..800d3be0e 100644
--- a/build.gradle
+++ b/android/build.gradle
diff --git a/gradle.properties b/android/gradle.properties
index aac7c9b46..aac7c9b46 100644
--- a/gradle.properties
+++ b/android/gradle.properties
diff --git a/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wrapper/gradle-wrapper.jar
index 13372aef5..13372aef5 100644
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/android/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index 9fe523a5c..9fe523a5c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
diff --git a/gradlew b/android/gradlew
index 9d82f7891..9d82f7891 100755
--- a/gradlew
+++ b/android/gradlew
diff --git a/gradlew.bat b/android/gradlew.bat
index 8a0b282aa..8a0b282aa 100644
--- a/gradlew.bat
+++ b/android/gradlew.bat
diff --git a/hello_sdl_android/build.gradle b/android/hello_sdl_android/build.gradle
index ac8b92278..ac8b92278 100755
--- a/hello_sdl_android/build.gradle
+++ b/android/hello_sdl_android/build.gradle
diff --git a/hello_sdl_android/proguard-rules.pro b/android/hello_sdl_android/proguard-rules.pro
index 7b318e2d1..7b318e2d1 100755
--- a/hello_sdl_android/proguard-rules.pro
+++ b/android/hello_sdl_android/proguard-rules.pro
diff --git a/hello_sdl_android/src/main/AndroidManifest.xml b/android/hello_sdl_android/src/main/AndroidManifest.xml
index 72a191542..72a191542 100755
--- a/hello_sdl_android/src/main/AndroidManifest.xml
+++ b/android/hello_sdl_android/src/main/AndroidManifest.xml
diff --git a/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/MainActivity.java b/android/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/MainActivity.java
index 6fc9203db..6fc9203db 100755
--- a/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/MainActivity.java
+++ b/android/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/MainActivity.java
diff --git a/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/SdlReceiver.java b/android/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/SdlReceiver.java
index 09cf35a82..09cf35a82 100755
--- a/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/SdlReceiver.java
+++ b/android/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/SdlReceiver.java
diff --git a/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/SdlRouterService.java b/android/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/SdlRouterService.java
index b4bec8cde..b4bec8cde 100755
--- a/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/SdlRouterService.java
+++ b/android/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/SdlRouterService.java
diff --git a/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/SdlService.java b/android/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/SdlService.java
index ea98cbf7f..ea98cbf7f 100755
--- a/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/SdlService.java
+++ b/android/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/SdlService.java
diff --git a/hello_sdl_android/src/main/res.zip b/android/hello_sdl_android/src/main/res.zip
index 16370f43a..16370f43a 100755
--- a/hello_sdl_android/src/main/res.zip
+++ b/android/hello_sdl_android/src/main/res.zip
Binary files differ
diff --git a/hello_sdl_android/src/main/res/drawable/sdl.png b/android/hello_sdl_android/src/main/res/drawable/sdl.png
index 5cfc0f84a..5cfc0f84a 100755
--- a/hello_sdl_android/src/main/res/drawable/sdl.png
+++ b/android/hello_sdl_android/src/main/res/drawable/sdl.png
Binary files differ
diff --git a/hello_sdl_android/src/main/res/layout/activity_main.xml b/android/hello_sdl_android/src/main/res/layout/activity_main.xml
index 8da613491..8da613491 100755
--- a/hello_sdl_android/src/main/res/layout/activity_main.xml
+++ b/android/hello_sdl_android/src/main/res/layout/activity_main.xml
diff --git a/hello_sdl_android/src/main/res/menu/main.xml b/android/hello_sdl_android/src/main/res/menu/main.xml
index d74718db3..d74718db3 100755
--- a/hello_sdl_android/src/main/res/menu/main.xml
+++ b/android/hello_sdl_android/src/main/res/menu/main.xml
diff --git a/hello_sdl_android/src/main/res/mipmap-hdpi/ic_launcher.png b/android/hello_sdl_android/src/main/res/mipmap-hdpi/ic_launcher.png
index d10bd53b0..d10bd53b0 100755
--- a/hello_sdl_android/src/main/res/mipmap-hdpi/ic_launcher.png
+++ b/android/hello_sdl_android/src/main/res/mipmap-hdpi/ic_launcher.png
Binary files differ
diff --git a/hello_sdl_android/src/main/res/mipmap-mdpi/ic_launcher.png b/android/hello_sdl_android/src/main/res/mipmap-mdpi/ic_launcher.png
index 239564b34..239564b34 100755
--- a/hello_sdl_android/src/main/res/mipmap-mdpi/ic_launcher.png
+++ b/android/hello_sdl_android/src/main/res/mipmap-mdpi/ic_launcher.png
Binary files differ
diff --git a/hello_sdl_android/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/hello_sdl_android/src/main/res/mipmap-xhdpi/ic_launcher.png
index 485ca6880..485ca6880 100755
--- a/hello_sdl_android/src/main/res/mipmap-xhdpi/ic_launcher.png
+++ b/android/hello_sdl_android/src/main/res/mipmap-xhdpi/ic_launcher.png
Binary files differ
diff --git a/hello_sdl_android/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/hello_sdl_android/src/main/res/mipmap-xxhdpi/ic_launcher.png
index 60574c2af..60574c2af 100755
--- a/hello_sdl_android/src/main/res/mipmap-xxhdpi/ic_launcher.png
+++ b/android/hello_sdl_android/src/main/res/mipmap-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/hello_sdl_android/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/hello_sdl_android/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index c43021775..c43021775 100755
--- a/hello_sdl_android/src/main/res/mipmap-xxxhdpi/ic_launcher.png
+++ b/android/hello_sdl_android/src/main/res/mipmap-xxxhdpi/ic_launcher.png
Binary files differ
diff --git a/hello_sdl_android/src/main/res/values-v11/styles.xml b/android/hello_sdl_android/src/main/res/values-v11/styles.xml
index a4a95bc46..a4a95bc46 100755
--- a/hello_sdl_android/src/main/res/values-v11/styles.xml
+++ b/android/hello_sdl_android/src/main/res/values-v11/styles.xml
diff --git a/hello_sdl_android/src/main/res/values-v14/styles.xml b/android/hello_sdl_android/src/main/res/values-v14/styles.xml
index 664f4f162..664f4f162 100755
--- a/hello_sdl_android/src/main/res/values-v14/styles.xml
+++ b/android/hello_sdl_android/src/main/res/values-v14/styles.xml
diff --git a/hello_sdl_android/src/main/res/values-w820dp/dimens.xml b/android/hello_sdl_android/src/main/res/values-w820dp/dimens.xml
index f3e70203b..f3e70203b 100755
--- a/hello_sdl_android/src/main/res/values-w820dp/dimens.xml
+++ b/android/hello_sdl_android/src/main/res/values-w820dp/dimens.xml
diff --git a/hello_sdl_android/src/main/res/values/dimens.xml b/android/hello_sdl_android/src/main/res/values/dimens.xml
index 55c1e5908..55c1e5908 100755
--- a/hello_sdl_android/src/main/res/values/dimens.xml
+++ b/android/hello_sdl_android/src/main/res/values/dimens.xml
diff --git a/hello_sdl_android/src/main/res/values/strings.xml b/android/hello_sdl_android/src/main/res/values/strings.xml
index 6f96374c6..6f96374c6 100755
--- a/hello_sdl_android/src/main/res/values/strings.xml
+++ b/android/hello_sdl_android/src/main/res/values/strings.xml
diff --git a/hello_sdl_android/src/main/res/values/styles.xml b/android/hello_sdl_android/src/main/res/values/styles.xml
index 845fb572b..845fb572b 100755
--- a/hello_sdl_android/src/main/res/values/styles.xml
+++ b/android/hello_sdl_android/src/main/res/values/styles.xml
diff --git a/hello_sdl_android/src/main/res/xml/accessory_filter.xml b/android/hello_sdl_android/src/main/res/xml/accessory_filter.xml
index 4b0ab7c83..4b0ab7c83 100755
--- a/hello_sdl_android/src/main/res/xml/accessory_filter.xml
+++ b/android/hello_sdl_android/src/main/res/xml/accessory_filter.xml
diff --git a/sdl_android/ROUTER_SERVICE_MESSAGING_PROTOCOL.md b/android/sdl_android/ROUTER_SERVICE_MESSAGING_PROTOCOL.md
index e641b8be2..e641b8be2 100644
--- a/sdl_android/ROUTER_SERVICE_MESSAGING_PROTOCOL.md
+++ b/android/sdl_android/ROUTER_SERVICE_MESSAGING_PROTOCOL.md
diff --git a/sdl_android/bintray.gradle b/android/sdl_android/bintray.gradle
index f4969df2c..f4969df2c 100644
--- a/sdl_android/bintray.gradle
+++ b/android/sdl_android/bintray.gradle
diff --git a/sdl_android/bintray.properties b/android/sdl_android/bintray.properties
index 760f99904..760f99904 100644
--- a/sdl_android/bintray.properties
+++ b/android/sdl_android/bintray.properties
diff --git a/sdl_android/build.gradle b/android/sdl_android/build.gradle
index 1334854a4..1334854a4 100644
--- a/sdl_android/build.gradle
+++ b/android/sdl_android/build.gradle
diff --git a/sdl_android/proguard-rules.pro b/android/sdl_android/proguard-rules.pro
index 3a5b9d9f9..3a5b9d9f9 100644
--- a/sdl_android/proguard-rules.pro
+++ b/android/sdl_android/proguard-rules.pro
diff --git a/sdl_android/src/androidTest/AndroidManifest.xml b/android/sdl_android/src/androidTest/AndroidManifest.xml
index 5231061fd..5231061fd 100644
--- a/sdl_android/src/androidTest/AndroidManifest.xml
+++ b/android/sdl_android/src/androidTest/AndroidManifest.xml
diff --git a/sdl_android/src/androidTest/assets/json/AddCommand.json b/android/sdl_android/src/androidTest/assets/json/AddCommand.json
index c6567e966..c6567e966 100644
--- a/sdl_android/src/androidTest/assets/json/AddCommand.json
+++ b/android/sdl_android/src/androidTest/assets/json/AddCommand.json
diff --git a/sdl_android/src/androidTest/assets/json/AddSubMenu.json b/android/sdl_android/src/androidTest/assets/json/AddSubMenu.json
index 37cc46adb..37cc46adb 100644
--- a/sdl_android/src/androidTest/assets/json/AddSubMenu.json
+++ b/android/sdl_android/src/androidTest/assets/json/AddSubMenu.json
diff --git a/sdl_android/src/androidTest/assets/json/Alert.json b/android/sdl_android/src/androidTest/assets/json/Alert.json
index ab497110b..ab497110b 100644
--- a/sdl_android/src/androidTest/assets/json/Alert.json
+++ b/android/sdl_android/src/androidTest/assets/json/Alert.json
diff --git a/sdl_android/src/androidTest/assets/json/AlertManeuver.json b/android/sdl_android/src/androidTest/assets/json/AlertManeuver.json
index 4099f80b0..4099f80b0 100644
--- a/sdl_android/src/androidTest/assets/json/AlertManeuver.json
+++ b/android/sdl_android/src/androidTest/assets/json/AlertManeuver.json
diff --git a/sdl_android/src/androidTest/assets/json/ButtonPress.json b/android/sdl_android/src/androidTest/assets/json/ButtonPress.json
index e74e857be..e74e857be 100644
--- a/sdl_android/src/androidTest/assets/json/ButtonPress.json
+++ b/android/sdl_android/src/androidTest/assets/json/ButtonPress.json
diff --git a/sdl_android/src/androidTest/assets/json/ChangeRegistration.json b/android/sdl_android/src/androidTest/assets/json/ChangeRegistration.json
index ceb93ccd3..ceb93ccd3 100644
--- a/sdl_android/src/androidTest/assets/json/ChangeRegistration.json
+++ b/android/sdl_android/src/androidTest/assets/json/ChangeRegistration.json
diff --git a/sdl_android/src/androidTest/assets/json/CreateInteractionChoiceSet.json b/android/sdl_android/src/androidTest/assets/json/CreateInteractionChoiceSet.json
index 6f01500db..6f01500db 100644
--- a/sdl_android/src/androidTest/assets/json/CreateInteractionChoiceSet.json
+++ b/android/sdl_android/src/androidTest/assets/json/CreateInteractionChoiceSet.json
diff --git a/sdl_android/src/androidTest/assets/json/DeleteCommand.json b/android/sdl_android/src/androidTest/assets/json/DeleteCommand.json
index cba061a03..cba061a03 100644
--- a/sdl_android/src/androidTest/assets/json/DeleteCommand.json
+++ b/android/sdl_android/src/androidTest/assets/json/DeleteCommand.json
diff --git a/sdl_android/src/androidTest/assets/json/DeleteFile.json b/android/sdl_android/src/androidTest/assets/json/DeleteFile.json
index ed3ff0cdc..ed3ff0cdc 100644
--- a/sdl_android/src/androidTest/assets/json/DeleteFile.json
+++ b/android/sdl_android/src/androidTest/assets/json/DeleteFile.json
diff --git a/sdl_android/src/androidTest/assets/json/DeleteInteractionChoiceSet.json b/android/sdl_android/src/androidTest/assets/json/DeleteInteractionChoiceSet.json
index 60f9a6c61..60f9a6c61 100644
--- a/sdl_android/src/androidTest/assets/json/DeleteInteractionChoiceSet.json
+++ b/android/sdl_android/src/androidTest/assets/json/DeleteInteractionChoiceSet.json
diff --git a/sdl_android/src/androidTest/assets/json/DeleteSubMenu.json b/android/sdl_android/src/androidTest/assets/json/DeleteSubMenu.json
index c31eb189d..c31eb189d 100644
--- a/sdl_android/src/androidTest/assets/json/DeleteSubMenu.json
+++ b/android/sdl_android/src/androidTest/assets/json/DeleteSubMenu.json
diff --git a/sdl_android/src/androidTest/assets/json/DiagnosticMessage.json b/android/sdl_android/src/androidTest/assets/json/DiagnosticMessage.json
index ff5e4a92d..ff5e4a92d 100644
--- a/sdl_android/src/androidTest/assets/json/DiagnosticMessage.json
+++ b/android/sdl_android/src/androidTest/assets/json/DiagnosticMessage.json
diff --git a/sdl_android/src/androidTest/assets/json/DialNumber.json b/android/sdl_android/src/androidTest/assets/json/DialNumber.json
index cb79aad84..cb79aad84 100644
--- a/sdl_android/src/androidTest/assets/json/DialNumber.json
+++ b/android/sdl_android/src/androidTest/assets/json/DialNumber.json
diff --git a/sdl_android/src/androidTest/assets/json/EndAudioPassThru.json b/android/sdl_android/src/androidTest/assets/json/EndAudioPassThru.json
index ed6554bc3..ed6554bc3 100644
--- a/sdl_android/src/androidTest/assets/json/EndAudioPassThru.json
+++ b/android/sdl_android/src/androidTest/assets/json/EndAudioPassThru.json
diff --git a/sdl_android/src/androidTest/assets/json/GetAppServiceData.json b/android/sdl_android/src/androidTest/assets/json/GetAppServiceData.json
index 6e4e9a2e2..6e4e9a2e2 100644
--- a/sdl_android/src/androidTest/assets/json/GetAppServiceData.json
+++ b/android/sdl_android/src/androidTest/assets/json/GetAppServiceData.json
diff --git a/sdl_android/src/androidTest/assets/json/GetDTCs.json b/android/sdl_android/src/androidTest/assets/json/GetDTCs.json
index 7a0f0e51d..7a0f0e51d 100644
--- a/sdl_android/src/androidTest/assets/json/GetDTCs.json
+++ b/android/sdl_android/src/androidTest/assets/json/GetDTCs.json
diff --git a/sdl_android/src/androidTest/assets/json/GetFile.json b/android/sdl_android/src/androidTest/assets/json/GetFile.json
index 422bb4ee6..422bb4ee6 100644
--- a/sdl_android/src/androidTest/assets/json/GetFile.json
+++ b/android/sdl_android/src/androidTest/assets/json/GetFile.json
diff --git a/sdl_android/src/androidTest/assets/json/GetInteriorVehicleData.json b/android/sdl_android/src/androidTest/assets/json/GetInteriorVehicleData.json
index 7000d2918..7000d2918 100644
--- a/sdl_android/src/androidTest/assets/json/GetInteriorVehicleData.json
+++ b/android/sdl_android/src/androidTest/assets/json/GetInteriorVehicleData.json
diff --git a/sdl_android/src/androidTest/assets/json/GetSystemCapability.json b/android/sdl_android/src/androidTest/assets/json/GetSystemCapability.json
index 5869df406..5869df406 100644
--- a/sdl_android/src/androidTest/assets/json/GetSystemCapability.json
+++ b/android/sdl_android/src/androidTest/assets/json/GetSystemCapability.json
diff --git a/sdl_android/src/androidTest/assets/json/GetVehicleData.json b/android/sdl_android/src/androidTest/assets/json/GetVehicleData.json
index 81b25ef87..81b25ef87 100644
--- a/sdl_android/src/androidTest/assets/json/GetVehicleData.json
+++ b/android/sdl_android/src/androidTest/assets/json/GetVehicleData.json
diff --git a/sdl_android/src/androidTest/assets/json/GetWayPoints.json b/android/sdl_android/src/androidTest/assets/json/GetWayPoints.json
index 8d06a9dd6..8d06a9dd6 100644
--- a/sdl_android/src/androidTest/assets/json/GetWayPoints.json
+++ b/android/sdl_android/src/androidTest/assets/json/GetWayPoints.json
diff --git a/sdl_android/src/androidTest/assets/json/ListFiles.json b/android/sdl_android/src/androidTest/assets/json/ListFiles.json
index d34d64ff0..d34d64ff0 100644
--- a/sdl_android/src/androidTest/assets/json/ListFiles.json
+++ b/android/sdl_android/src/androidTest/assets/json/ListFiles.json
diff --git a/sdl_android/src/androidTest/assets/json/PerformAppServiceInteraction.json b/android/sdl_android/src/androidTest/assets/json/PerformAppServiceInteraction.json
index e16bc880f..e16bc880f 100644
--- a/sdl_android/src/androidTest/assets/json/PerformAppServiceInteraction.json
+++ b/android/sdl_android/src/androidTest/assets/json/PerformAppServiceInteraction.json
diff --git a/sdl_android/src/androidTest/assets/json/PerformAudioPassThru.json b/android/sdl_android/src/androidTest/assets/json/PerformAudioPassThru.json
index 60e88b694..60e88b694 100644
--- a/sdl_android/src/androidTest/assets/json/PerformAudioPassThru.json
+++ b/android/sdl_android/src/androidTest/assets/json/PerformAudioPassThru.json
diff --git a/sdl_android/src/androidTest/assets/json/PerformInteraction.json b/android/sdl_android/src/androidTest/assets/json/PerformInteraction.json
index b8965ee61..b8965ee61 100644
--- a/sdl_android/src/androidTest/assets/json/PerformInteraction.json
+++ b/android/sdl_android/src/androidTest/assets/json/PerformInteraction.json
diff --git a/sdl_android/src/androidTest/assets/json/PublishAppService.json b/android/sdl_android/src/androidTest/assets/json/PublishAppService.json
index 464d5d830..464d5d830 100644
--- a/sdl_android/src/androidTest/assets/json/PublishAppService.json
+++ b/android/sdl_android/src/androidTest/assets/json/PublishAppService.json
diff --git a/sdl_android/src/androidTest/assets/json/PutFile.json b/android/sdl_android/src/androidTest/assets/json/PutFile.json
index e989a62aa..e989a62aa 100644
--- a/sdl_android/src/androidTest/assets/json/PutFile.json
+++ b/android/sdl_android/src/androidTest/assets/json/PutFile.json
diff --git a/sdl_android/src/androidTest/assets/json/ReadDID.json b/android/sdl_android/src/androidTest/assets/json/ReadDID.json
index 5cb3403fb..5cb3403fb 100644
--- a/sdl_android/src/androidTest/assets/json/ReadDID.json
+++ b/android/sdl_android/src/androidTest/assets/json/ReadDID.json
diff --git a/sdl_android/src/androidTest/assets/json/RegisterAppInterface.json b/android/sdl_android/src/androidTest/assets/json/RegisterAppInterface.json
index 1d13635a9..1d13635a9 100644
--- a/sdl_android/src/androidTest/assets/json/RegisterAppInterface.json
+++ b/android/sdl_android/src/androidTest/assets/json/RegisterAppInterface.json
diff --git a/sdl_android/src/androidTest/assets/json/ResetGlobalProperties.json b/android/sdl_android/src/androidTest/assets/json/ResetGlobalProperties.json
index 02ff2ba26..02ff2ba26 100644
--- a/sdl_android/src/androidTest/assets/json/ResetGlobalProperties.json
+++ b/android/sdl_android/src/androidTest/assets/json/ResetGlobalProperties.json
diff --git a/sdl_android/src/androidTest/assets/json/ScrollableMessage.json b/android/sdl_android/src/androidTest/assets/json/ScrollableMessage.json
index f86dc188c..f86dc188c 100644
--- a/sdl_android/src/androidTest/assets/json/ScrollableMessage.json
+++ b/android/sdl_android/src/androidTest/assets/json/ScrollableMessage.json
diff --git a/sdl_android/src/androidTest/assets/json/SendHapticData.json b/android/sdl_android/src/androidTest/assets/json/SendHapticData.json
index 42b863aae..42b863aae 100644
--- a/sdl_android/src/androidTest/assets/json/SendHapticData.json
+++ b/android/sdl_android/src/androidTest/assets/json/SendHapticData.json
diff --git a/sdl_android/src/androidTest/assets/json/SendLocation.json b/android/sdl_android/src/androidTest/assets/json/SendLocation.json
index 9b0ae8901..9b0ae8901 100644
--- a/sdl_android/src/androidTest/assets/json/SendLocation.json
+++ b/android/sdl_android/src/androidTest/assets/json/SendLocation.json
diff --git a/sdl_android/src/androidTest/assets/json/SetAppIcon.json b/android/sdl_android/src/androidTest/assets/json/SetAppIcon.json
index 67f3b0b41..67f3b0b41 100644
--- a/sdl_android/src/androidTest/assets/json/SetAppIcon.json
+++ b/android/sdl_android/src/androidTest/assets/json/SetAppIcon.json
diff --git a/sdl_android/src/androidTest/assets/json/SetDisplayLayout.json b/android/sdl_android/src/androidTest/assets/json/SetDisplayLayout.json
index ec9e62f54..ec9e62f54 100644
--- a/sdl_android/src/androidTest/assets/json/SetDisplayLayout.json
+++ b/android/sdl_android/src/androidTest/assets/json/SetDisplayLayout.json
diff --git a/sdl_android/src/androidTest/assets/json/SetGlobalProperties.json b/android/sdl_android/src/androidTest/assets/json/SetGlobalProperties.json
index 60cdfbffb..60cdfbffb 100644
--- a/sdl_android/src/androidTest/assets/json/SetGlobalProperties.json
+++ b/android/sdl_android/src/androidTest/assets/json/SetGlobalProperties.json
diff --git a/sdl_android/src/androidTest/assets/json/SetInteriorVehicleData.json b/android/sdl_android/src/androidTest/assets/json/SetInteriorVehicleData.json
index 9bcdc01dc..9bcdc01dc 100644
--- a/sdl_android/src/androidTest/assets/json/SetInteriorVehicleData.json
+++ b/android/sdl_android/src/androidTest/assets/json/SetInteriorVehicleData.json
diff --git a/sdl_android/src/androidTest/assets/json/SetMediaClockTimer.json b/android/sdl_android/src/androidTest/assets/json/SetMediaClockTimer.json
index e4950d05d..e4950d05d 100644
--- a/sdl_android/src/androidTest/assets/json/SetMediaClockTimer.json
+++ b/android/sdl_android/src/androidTest/assets/json/SetMediaClockTimer.json
diff --git a/sdl_android/src/androidTest/assets/json/Show.json b/android/sdl_android/src/androidTest/assets/json/Show.json
index 97ef1f20f..97ef1f20f 100644
--- a/sdl_android/src/androidTest/assets/json/Show.json
+++ b/android/sdl_android/src/androidTest/assets/json/Show.json
diff --git a/sdl_android/src/androidTest/assets/json/ShowConstantTBT.json b/android/sdl_android/src/androidTest/assets/json/ShowConstantTBT.json
index 0a0c30b0c..0a0c30b0c 100644
--- a/sdl_android/src/androidTest/assets/json/ShowConstantTBT.json
+++ b/android/sdl_android/src/androidTest/assets/json/ShowConstantTBT.json
diff --git a/sdl_android/src/androidTest/assets/json/Slider.json b/android/sdl_android/src/androidTest/assets/json/Slider.json
index 38f033df4..38f033df4 100644
--- a/sdl_android/src/androidTest/assets/json/Slider.json
+++ b/android/sdl_android/src/androidTest/assets/json/Slider.json
diff --git a/sdl_android/src/androidTest/assets/json/Speak.json b/android/sdl_android/src/androidTest/assets/json/Speak.json
index 413535ac6..413535ac6 100644
--- a/sdl_android/src/androidTest/assets/json/Speak.json
+++ b/android/sdl_android/src/androidTest/assets/json/Speak.json
diff --git a/sdl_android/src/androidTest/assets/json/StreamRPC.json b/android/sdl_android/src/androidTest/assets/json/StreamRPC.json
index ff20ffc93..ff20ffc93 100644
--- a/sdl_android/src/androidTest/assets/json/StreamRPC.json
+++ b/android/sdl_android/src/androidTest/assets/json/StreamRPC.json
diff --git a/sdl_android/src/androidTest/assets/json/SubscribeButton.json b/android/sdl_android/src/androidTest/assets/json/SubscribeButton.json
index bfb660c7e..bfb660c7e 100644
--- a/sdl_android/src/androidTest/assets/json/SubscribeButton.json
+++ b/android/sdl_android/src/androidTest/assets/json/SubscribeButton.json
diff --git a/sdl_android/src/androidTest/assets/json/SubscribeVehicleData.json b/android/sdl_android/src/androidTest/assets/json/SubscribeVehicleData.json
index 92cf00a1b..92cf00a1b 100644
--- a/sdl_android/src/androidTest/assets/json/SubscribeVehicleData.json
+++ b/android/sdl_android/src/androidTest/assets/json/SubscribeVehicleData.json
diff --git a/sdl_android/src/androidTest/assets/json/SubscribeWayPoints.json b/android/sdl_android/src/androidTest/assets/json/SubscribeWayPoints.json
index bd1eee5c6..bd1eee5c6 100644
--- a/sdl_android/src/androidTest/assets/json/SubscribeWayPoints.json
+++ b/android/sdl_android/src/androidTest/assets/json/SubscribeWayPoints.json
diff --git a/sdl_android/src/androidTest/assets/json/SystemRequest.json b/android/sdl_android/src/androidTest/assets/json/SystemRequest.json
index 44c6d5205..44c6d5205 100644
--- a/sdl_android/src/androidTest/assets/json/SystemRequest.json
+++ b/android/sdl_android/src/androidTest/assets/json/SystemRequest.json
diff --git a/sdl_android/src/androidTest/assets/json/UnregisterAppInterface.json b/android/sdl_android/src/androidTest/assets/json/UnregisterAppInterface.json
index f9cc9f0de..f9cc9f0de 100644
--- a/sdl_android/src/androidTest/assets/json/UnregisterAppInterface.json
+++ b/android/sdl_android/src/androidTest/assets/json/UnregisterAppInterface.json
diff --git a/sdl_android/src/androidTest/assets/json/UnsubscribeButton.json b/android/sdl_android/src/androidTest/assets/json/UnsubscribeButton.json
index cb2164d94..cb2164d94 100644
--- a/sdl_android/src/androidTest/assets/json/UnsubscribeButton.json
+++ b/android/sdl_android/src/androidTest/assets/json/UnsubscribeButton.json
diff --git a/sdl_android/src/androidTest/assets/json/UnsubscribeVehicleData.json b/android/sdl_android/src/androidTest/assets/json/UnsubscribeVehicleData.json
index d01b99aa8..d01b99aa8 100644
--- a/sdl_android/src/androidTest/assets/json/UnsubscribeVehicleData.json
+++ b/android/sdl_android/src/androidTest/assets/json/UnsubscribeVehicleData.json
diff --git a/sdl_android/src/androidTest/assets/json/UnsubscribeWayPoints.json b/android/sdl_android/src/androidTest/assets/json/UnsubscribeWayPoints.json
index 60e2a98e4..60e2a98e4 100644
--- a/sdl_android/src/androidTest/assets/json/UnsubscribeWayPoints.json
+++ b/android/sdl_android/src/androidTest/assets/json/UnsubscribeWayPoints.json
diff --git a/sdl_android/src/androidTest/assets/json/UpdateTurnList.json b/android/sdl_android/src/androidTest/assets/json/UpdateTurnList.json
index 9cd449acd..9cd449acd 100644
--- a/sdl_android/src/androidTest/assets/json/UpdateTurnList.json
+++ b/android/sdl_android/src/androidTest/assets/json/UpdateTurnList.json
diff --git a/sdl_android/src/androidTest/assets/xml/MOBILE_API.xml b/android/sdl_android/src/androidTest/assets/xml/MOBILE_API.xml
index 769e87d3c..769e87d3c 100644
--- a/sdl_android/src/androidTest/assets/xml/MOBILE_API.xml
+++ b/android/sdl_android/src/androidTest/assets/xml/MOBILE_API.xml
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/AndroidTestCase2.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/AndroidTestCase2.java
index 1aafa19b6..1aafa19b6 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/AndroidTestCase2.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/AndroidTestCase2.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/SdlConnection/SdlConnectionTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/SdlConnection/SdlConnectionTest.java
index 776da6ccc..776da6ccc 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/SdlConnection/SdlConnectionTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/SdlConnection/SdlConnectionTest.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/managers/SdlManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/SdlManagerTests.java
index b1a1df0ed..b1a1df0ed 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/managers/SdlManagerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/SdlManagerTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/managers/audio/AudioStreamManagerTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/audio/AudioStreamManagerTest.java
index 35c57a4c3..35c57a4c3 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/managers/audio/AudioStreamManagerTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/audio/AudioStreamManagerTest.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/managers/file/FileManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/file/FileManagerTests.java
index b4e27f205..b4e27f205 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/managers/file/FileManagerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/file/FileManagerTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lockscreen/LockScreenConfigTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lockscreen/LockScreenConfigTests.java
index c2d4066ce..c2d4066ce 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lockscreen/LockScreenConfigTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lockscreen/LockScreenConfigTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lockscreen/LockScreenManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lockscreen/LockScreenManagerTests.java
index 69e0aa898..69e0aa898 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lockscreen/LockScreenManagerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lockscreen/LockScreenManagerTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/managers/permission/PermissionManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/permission/PermissionManagerTests.java
index 6a66a3092..6a66a3092 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/managers/permission/PermissionManagerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/permission/PermissionManagerTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/ScreenManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/ScreenManagerTests.java
index 872e09b81..872e09b81 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/ScreenManagerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/ScreenManagerTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/SoftButtonManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/SoftButtonManagerTests.java
index 144057c36..144057c36 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/SoftButtonManagerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/SoftButtonManagerTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/TextAndGraphicManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/TextAndGraphicManagerTests.java
index d063f52e3..d063f52e3 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/TextAndGraphicManagerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/TextAndGraphicManagerTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/managers/video/VideoStreamManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/video/VideoStreamManagerTests.java
index e0febdb51..e0febdb51 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/managers/video/VideoStreamManagerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/video/VideoStreamManagerTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/protocol/SdlPacketTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/protocol/SdlPacketTests.java
index a9bc03bb0..a9bc03bb0 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/protocol/SdlPacketTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/protocol/SdlPacketTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/protocol/SdlProtocolTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/protocol/SdlProtocolTests.java
index 896c7af6d..896c7af6d 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/protocol/SdlProtocolTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/protocol/SdlProtocolTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/protocol/WiProProtocolTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/protocol/WiProProtocolTests.java
index bec4a6d92..bec4a6d92 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/protocol/WiProProtocolTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/protocol/WiProProtocolTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/BaseRpcTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/BaseRpcTests.java
index 8b9d5f3f7..8b9d5f3f7 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/BaseRpcTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/BaseRpcTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/Config.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/Config.java
index 7f424bda9..7f424bda9 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/Config.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/Config.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/JsonUtils.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/JsonUtils.java
index ce302e5d6..ce302e5d6 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/JsonUtils.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/JsonUtils.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/Logger.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/Logger.java
index ab922fd7a..ab922fd7a 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/Logger.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/Logger.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/NullValues.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/NullValues.java
index ce5972887..ce5972887 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/NullValues.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/NullValues.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/SampleRpc.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/SampleRpc.java
index 67c15706c..67c15706c 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/SampleRpc.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/SampleRpc.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/SdlConnection/SdlSessionTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/SdlConnection/SdlSessionTests.java
index ec7bf710a..ec7bf710a 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/SdlConnection/SdlSessionTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/SdlConnection/SdlSessionTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/SdlUnitTestContants.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/SdlUnitTestContants.java
index 3b38b94f3..3b38b94f3 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/SdlUnitTestContants.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/SdlUnitTestContants.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/Test.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/Test.java
index cc8842aea..cc8842aea 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/Test.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/Test.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/Validator.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/Validator.java
index 595793049..595793049 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/Validator.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/Validator.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/VehicleDataHelper.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/VehicleDataHelper.java
index 22ce7a15b..22ce7a15b 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/VehicleDataHelper.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/VehicleDataHelper.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/encoder/EncoderUtilsTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/encoder/EncoderUtilsTest.java
index 083a5dd3f..083a5dd3f 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/encoder/EncoderUtilsTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/encoder/EncoderUtilsTest.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/json/rpc/JsonFileReader.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/json/rpc/JsonFileReader.java
index e60b35d2e..e60b35d2e 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/json/rpc/JsonFileReader.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/json/rpc/JsonFileReader.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/BinaryFrameHeaderTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/BinaryFrameHeaderTests.java
index a1b108fea..a1b108fea 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/BinaryFrameHeaderTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/BinaryFrameHeaderTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/enums/FrameDataControlFrameTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/enums/FrameDataControlFrameTypeTests.java
index 76090277a..76090277a 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/enums/FrameDataControlFrameTypeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/enums/FrameDataControlFrameTypeTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/enums/FrameDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/enums/FrameDataTests.java
index 07563248e..07563248e 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/enums/FrameDataTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/enums/FrameDataTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/enums/FrameTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/enums/FrameTypeTests.java
index 241872b7a..241872b7a 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/enums/FrameTypeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/enums/FrameTypeTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/enums/MessageTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/enums/MessageTypeTests.java
index d0cb7cc30..d0cb7cc30 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/enums/MessageTypeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/enums/MessageTypeTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/enums/SessionTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/enums/SessionTypeTests.java
index 8a8634cc4..8a8634cc4 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/enums/SessionTypeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/enums/SessionTypeTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/heartbeat/HeartbeatMonitorTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/heartbeat/HeartbeatMonitorTests.java
index 0b5524786..0b5524786 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/heartbeat/HeartbeatMonitorTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/heartbeat/HeartbeatMonitorTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/InternalProxyMessageTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/InternalProxyMessageTests.java
index f5baf5e06..f5baf5e06 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/InternalProxyMessageTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/InternalProxyMessageTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/LockScreenManagerTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/LockScreenManagerTest.java
index 1d02875b1..1d02875b1 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/LockScreenManagerTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/LockScreenManagerTest.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/RPCMessageTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/RPCMessageTests.java
index 51727bb66..51727bb66 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/RPCMessageTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/RPCMessageTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/RPCRequestFactoryTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/RPCRequestFactoryTests.java
index e31aedbe7..e31aedbe7 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/RPCRequestFactoryTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/RPCRequestFactoryTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/RPCRequestTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/RPCRequestTest.java
index eea733631..eea733631 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/RPCRequestTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/RPCRequestTest.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/RPCStructTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/RPCStructTests.java
index 370d30979..370d30979 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/RPCStructTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/RPCStructTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/SdlProxyBaseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/SdlProxyBaseTests.java
index da48c692d..da48c692d 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/SdlProxyBaseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/SdlProxyBaseTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/SystemCapabilityManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/SystemCapabilityManagerTests.java
index 91fbf6dde..91fbf6dde 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/SystemCapabilityManagerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/SystemCapabilityManagerTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/TTSChunkFactoryTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/TTSChunkFactoryTests.java
index 222ab5bbc..222ab5bbc 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/TTSChunkFactoryTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/TTSChunkFactoryTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/RPCConstructorsTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/RPCConstructorsTests.java
index 7b497310e..7b497310e 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/RPCConstructorsTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/RPCConstructorsTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AirbagStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AirbagStatusTests.java
index d65e68760..d65e68760 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AirbagStatusTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AirbagStatusTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceCapabilityTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceCapabilityTest.java
index 6bd5fe01e..6bd5fe01e 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceCapabilityTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceCapabilityTest.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceDataTests.java
index 9fec35631..9fec35631 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceDataTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceDataTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceManifestTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceManifestTests.java
index 99bd5b716..99bd5b716 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceManifestTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceManifestTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceRecordTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceRecordTests.java
index af58b12fb..af58b12fb 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceRecordTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceRecordTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServicesCapabilitiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServicesCapabilitiesTests.java
index bb2d102f2..bb2d102f2 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServicesCapabilitiesTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServicesCapabilitiesTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AudioControlCapabilitiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AudioControlCapabilitiesTests.java
index 524a6bde2..524a6bde2 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AudioControlCapabilitiesTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AudioControlCapabilitiesTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AudioControlDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AudioControlDataTests.java
index 4dba080ac..4dba080ac 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AudioControlDataTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AudioControlDataTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AudioPassThruCapabilitiesTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AudioPassThruCapabilitiesTest.java
index 476898685..476898685 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AudioPassThruCapabilitiesTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AudioPassThruCapabilitiesTest.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/BeltStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/BeltStatusTests.java
index 5fb53ef3d..5fb53ef3d 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/BeltStatusTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/BeltStatusTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/BodyInformationTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/BodyInformationTests.java
index 245ee7ec8..245ee7ec8 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/BodyInformationTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/BodyInformationTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ButtonCapabilitiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ButtonCapabilitiesTests.java
index b8001dc2c..b8001dc2c 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ButtonCapabilitiesTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ButtonCapabilitiesTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ChoiceTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ChoiceTests.java
index 0df50f405..0df50f405 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ChoiceTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ChoiceTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ClimateControlCapabilitiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ClimateControlCapabilitiesTests.java
index c391eb4eb..c391eb4eb 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ClimateControlCapabilitiesTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ClimateControlCapabilitiesTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ClimateControlDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ClimateControlDataTests.java
index 99d5c3285..99d5c3285 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ClimateControlDataTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ClimateControlDataTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/CloudAppPropertiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/CloudAppPropertiesTests.java
index 5340efdd2..5340efdd2 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/CloudAppPropertiesTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/CloudAppPropertiesTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ClusterModeStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ClusterModeStatusTests.java
index 883b456fa..883b456fa 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ClusterModeStatusTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ClusterModeStatusTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/CoordinateTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/CoordinateTests.java
index 5f8a8327f..5f8a8327f 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/CoordinateTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/CoordinateTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DIDResultTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DIDResultTests.java
index b929f2f80..b929f2f80 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DIDResultTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DIDResultTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DTCTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DTCTests.java
index 3079d2003..3079d2003 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DTCTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DTCTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DateTimeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DateTimeTests.java
index 2cf38b68f..2cf38b68f 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DateTimeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DateTimeTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DeviceInfoTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DeviceInfoTests.java
index cbd432cc2..cbd432cc2 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DeviceInfoTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DeviceInfoTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DeviceStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DeviceStatusTests.java
index 4c966f06e..4c966f06e 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DeviceStatusTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DeviceStatusTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DisplayCapabilitiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DisplayCapabilitiesTests.java
index 9e627c217..9e627c217 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DisplayCapabilitiesTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DisplayCapabilitiesTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ECallInfoTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ECallInfoTests.java
index 82a57869a..82a57869a 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ECallInfoTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ECallInfoTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/EmergencyEventTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/EmergencyEventTests.java
index 6d72e440f..6d72e440f 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/EmergencyEventTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/EmergencyEventTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/EqualizerSettingsTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/EqualizerSettingsTests.java
index a803b1ded..a803b1ded 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/EqualizerSettingsTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/EqualizerSettingsTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/FuelRangeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/FuelRangeTests.java
index 2dffd2f5b..2dffd2f5b 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/FuelRangeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/FuelRangeTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/GPSDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/GPSDataTests.java
index 0c6800ea5..0c6800ea5 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/GPSDataTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/GPSDataTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMICapabilitiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMICapabilitiesTests.java
index cc4813caa..cc4813caa 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMICapabilitiesTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMICapabilitiesTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMIPermissionsTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMIPermissionsTests.java
index fd82505f2..fd82505f2 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMIPermissionsTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMIPermissionsTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMISettingsControlCapabilitiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMISettingsControlCapabilitiesTests.java
index 620868b40..620868b40 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMISettingsControlCapabilitiesTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMISettingsControlCapabilitiesTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMISettingsControlDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMISettingsControlDataTests.java
index 85205f617..85205f617 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMISettingsControlDataTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMISettingsControlDataTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HapticRectTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HapticRectTests.java
index c72204640..c72204640 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HapticRectTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HapticRectTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HeadLampStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HeadLampStatusTests.java
index 277786344..277786344 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HeadLampStatusTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HeadLampStatusTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HeadersTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HeadersTests.java
index 09c69022f..09c69022f 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HeadersTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HeadersTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ImageFieldTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ImageFieldTests.java
index 4291621df..4291621df 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ImageFieldTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ImageFieldTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ImageResolutionTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ImageResolutionTests.java
index 83f3126cf..83f3126cf 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ImageResolutionTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ImageResolutionTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ImageTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ImageTests.java
index 53f5bf435..53f5bf435 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ImageTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ImageTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/KeyboardPropertiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/KeyboardPropertiesTests.java
index 3eaf88e28..3eaf88e28 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/KeyboardPropertiesTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/KeyboardPropertiesTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LightCapabilitiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LightCapabilitiesTests.java
index 6122f4305..6122f4305 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LightCapabilitiesTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LightCapabilitiesTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LightControlCapabilitiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LightControlCapabilitiesTests.java
index 4ebd7f467..4ebd7f467 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LightControlCapabilitiesTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LightControlCapabilitiesTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LightControlDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LightControlDataTests.java
index c891e0769..c891e0769 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LightControlDataTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LightControlDataTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LightStateTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LightStateTests.java
index 196769e00..196769e00 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LightStateTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LightStateTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LocationDetailsTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LocationDetailsTests.java
index 18da17eac..18da17eac 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LocationDetailsTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LocationDetailsTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MassageCushionFirmnessTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MassageCushionFirmnessTest.java
index da8a7cbfe..da8a7cbfe 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MassageCushionFirmnessTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MassageCushionFirmnessTest.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MassageModeDataTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MassageModeDataTest.java
index 958de9fa2..958de9fa2 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MassageModeDataTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MassageModeDataTest.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MediaServiceDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MediaServiceDataTests.java
index 2b4c352c5..2b4c352c5 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MediaServiceDataTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MediaServiceDataTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MediaServiceManifestTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MediaServiceManifestTests.java
index 85332bc0c..85332bc0c 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MediaServiceManifestTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MediaServiceManifestTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MenuParamsTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MenuParamsTests.java
index ea823f619..ea823f619 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MenuParamsTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MenuParamsTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MetadataTagsTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MetadataTagsTests.java
index 5f27cc132..5f27cc132 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MetadataTagsTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MetadataTagsTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ModuleDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ModuleDataTests.java
index b553587ad..b553587ad 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ModuleDataTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ModuleDataTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MyKeyTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MyKeyTests.java
index 48b0f33ab..48b0f33ab 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MyKeyTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MyKeyTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/NavigationCapabilityTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/NavigationCapabilityTests.java
index efbf7e30d..efbf7e30d 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/NavigationCapabilityTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/NavigationCapabilityTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/NavigationInstructionTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/NavigationInstructionTests.java
index 38500561b..38500561b 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/NavigationInstructionTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/NavigationInstructionTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/NavigationServiceDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/NavigationServiceDataTests.java
index 9b59062d4..9b59062d4 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/NavigationServiceDataTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/NavigationServiceDataTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/NavigationServiceManifestTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/NavigationServiceManifestTests.java
index de4144677..de4144677 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/NavigationServiceManifestTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/NavigationServiceManifestTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/OasisAddressTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/OasisAddressTests.java
index cf39a3c18..cf39a3c18 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/OasisAddressTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/OasisAddressTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ParameterPermissionsTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ParameterPermissionsTests.java
index a40f6a1b0..a40f6a1b0 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ParameterPermissionsTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ParameterPermissionsTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/PermissionItemTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/PermissionItemTest.java
index 465783ba2..465783ba2 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/PermissionItemTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/PermissionItemTest.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/PhoneCapabilityTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/PhoneCapabilityTests.java
index 2614db0fd..2614db0fd 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/PhoneCapabilityTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/PhoneCapabilityTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/PresetBankCapabilitiesTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/PresetBankCapabilitiesTest.java
index f56d2a212..f56d2a212 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/PresetBankCapabilitiesTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/PresetBankCapabilitiesTest.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RGBColorTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RGBColorTest.java
index a9c0033a0..a9c0033a0 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RGBColorTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RGBColorTest.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RadioControlCapabilitiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RadioControlCapabilitiesTests.java
index 915e779a7..915e779a7 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RadioControlCapabilitiesTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RadioControlCapabilitiesTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RadioControlDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RadioControlDataTests.java
index a560827c4..a560827c4 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RadioControlDataTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RadioControlDataTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RdsDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RdsDataTests.java
index 7414304b0..7414304b0 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RdsDataTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RdsDataTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RectangleTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RectangleTests.java
index 569a4db83..569a4db83 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RectangleTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RectangleTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RemoteControlCapabilitiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RemoteControlCapabilitiesTests.java
index e6a2d2b9a..e6a2d2b9a 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RemoteControlCapabilitiesTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RemoteControlCapabilitiesTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ScreenParamsTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ScreenParamsTest.java
index 4621f8950..4621f8950 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ScreenParamsTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ScreenParamsTest.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SdlMsgVersionTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SdlMsgVersionTest.java
index 645652ea0..645652ea0 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SdlMsgVersionTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SdlMsgVersionTest.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatControlCapabilitiesTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatControlCapabilitiesTest.java
index d988fa991..d988fa991 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatControlCapabilitiesTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatControlCapabilitiesTest.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatControlDataTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatControlDataTest.java
index 535e7cf3e..535e7cf3e 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatControlDataTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatControlDataTest.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatMemoryActionTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatMemoryActionTest.java
index a8c17cee3..a8c17cee3 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatMemoryActionTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatMemoryActionTest.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SingleTireStatusTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SingleTireStatusTest.java
index 9f1d3342a..9f1d3342a 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SingleTireStatusTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SingleTireStatusTest.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SisDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SisDataTests.java
index 51e38f8d1..51e38f8d1 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SisDataTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SisDataTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SoftButtonCapabilitiesTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SoftButtonCapabilitiesTest.java
index 125aa5e41..125aa5e41 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SoftButtonCapabilitiesTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SoftButtonCapabilitiesTest.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SoftButtonTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SoftButtonTest.java
index b2dfb54fc..b2dfb54fc 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SoftButtonTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SoftButtonTest.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/StartTimeTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/StartTimeTest.java
index 7d1c7361b..7d1c7361b 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/StartTimeTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/StartTimeTest.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/StationIDNumberTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/StationIDNumberTests.java
index e7e61f8fd..e7e61f8fd 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/StationIDNumberTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/StationIDNumberTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SystemCapabilityTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SystemCapabilityTests.java
index bc50907db..bc50907db 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SystemCapabilityTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SystemCapabilityTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TTSChunkTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TTSChunkTest.java
index 598993771..598993771 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TTSChunkTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TTSChunkTest.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TemperatureTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TemperatureTests.java
index 090f5a235..090f5a235 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TemperatureTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TemperatureTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TemplateColorSchemeTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TemplateColorSchemeTest.java
index 0ac90fc86..0ac90fc86 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TemplateColorSchemeTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TemplateColorSchemeTest.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TextFieldTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TextFieldTest.java
index 6b5d4d3e2..6b5d4d3e2 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TextFieldTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TextFieldTest.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TireStatusTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TireStatusTest.java
index 5552a5c29..5552a5c29 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TireStatusTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TireStatusTest.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TouchCoordTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TouchCoordTest.java
index cfa4a4f33..cfa4a4f33 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TouchCoordTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TouchCoordTest.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TouchEventCapabilitiesTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TouchEventCapabilitiesTest.java
index b488d4cb7..b488d4cb7 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TouchEventCapabilitiesTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TouchEventCapabilitiesTest.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TouchEventTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TouchEventTest.java
index e3207f704..e3207f704 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TouchEventTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TouchEventTest.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TurnTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TurnTests.java
index 8986fd4a9..8986fd4a9 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TurnTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TurnTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VehicleDataResultTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VehicleDataResultTest.java
index 8d5d1e861..8d5d1e861 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VehicleDataResultTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VehicleDataResultTest.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VehicleTypeTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VehicleTypeTest.java
index 17f663ae6..17f663ae6 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VehicleTypeTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VehicleTypeTest.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VideoStreamingCapabilityTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VideoStreamingCapabilityTests.java
index 54cfc1a22..54cfc1a22 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VideoStreamingCapabilityTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VideoStreamingCapabilityTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VideoStreamingFormatTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VideoStreamingFormatTests.java
index ff7cb2719..ff7cb2719 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VideoStreamingFormatTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VideoStreamingFormatTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VrHelpItemTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VrHelpItemTest.java
index 55f00dd1c..55f00dd1c 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VrHelpItemTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VrHelpItemTest.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WeatherAlertTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WeatherAlertTests.java
index 4a8ade572..4a8ade572 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WeatherAlertTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WeatherAlertTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WeatherDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WeatherDataTests.java
index 70454f5c3..70454f5c3 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WeatherDataTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WeatherDataTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WeatherServiceDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WeatherServiceDataTests.java
index 09c976538..09c976538 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WeatherServiceDataTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WeatherServiceDataTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WeatherServiceManifestTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WeatherServiceManifestTests.java
index cbd65fae7..cbd65fae7 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WeatherServiceManifestTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WeatherServiceManifestTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AmbientLightStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AmbientLightStatusTests.java
index 859eafba0..859eafba0 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AmbientLightStatusTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AmbientLightStatusTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AppHmiTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AppHmiTypeTests.java
index 6446cb914..6446cb914 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AppHmiTypeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AppHmiTypeTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AppInterfaceUnregisteredReasonTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AppInterfaceUnregisteredReasonTests.java
index 8896d13e7..8896d13e7 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AppInterfaceUnregisteredReasonTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AppInterfaceUnregisteredReasonTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AppServiceTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AppServiceTypeTests.java
index ce4867e41..ce4867e41 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AppServiceTypeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AppServiceTypeTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AudioStreamingIndicatorTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AudioStreamingIndicatorTests.java
index 85312ecde..85312ecde 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AudioStreamingIndicatorTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AudioStreamingIndicatorTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AudioStreamingStateTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AudioStreamingStateTests.java
index 178613e53..178613e53 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AudioStreamingStateTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AudioStreamingStateTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AudioTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AudioTypeTests.java
index 6cbecf09a..6cbecf09a 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AudioTypeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AudioTypeTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/BitsPerSampleTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/BitsPerSampleTests.java
index 65b4766e8..65b4766e8 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/BitsPerSampleTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/BitsPerSampleTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ButtonEventModeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ButtonEventModeTests.java
index 4145844ee..4145844ee 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ButtonEventModeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ButtonEventModeTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ButtonNameTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ButtonNameTests.java
index e823e7593..e823e7593 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ButtonNameTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ButtonNameTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ButtonPressModeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ButtonPressModeTests.java
index cbfe16a73..cbfe16a73 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ButtonPressModeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ButtonPressModeTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/CarModeStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/CarModeStatusTests.java
index d66760d9a..d66760d9a 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/CarModeStatusTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/CarModeStatusTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/CharacterSetTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/CharacterSetTests.java
index 99bc37265..99bc37265 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/CharacterSetTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/CharacterSetTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/CompassDirectionTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/CompassDirectionTests.java
index 7eb7d31a0..7eb7d31a0 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/CompassDirectionTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/CompassDirectionTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ComponentVolumeStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ComponentVolumeStatusTests.java
index 20946252c..20946252c 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ComponentVolumeStatusTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ComponentVolumeStatusTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DefrostZoneTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DefrostZoneTests.java
index f1f375623..f1f375623 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DefrostZoneTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DefrostZoneTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DeviceLevelStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DeviceLevelStatusTests.java
index 71c15d0fb..71c15d0fb 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DeviceLevelStatusTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DeviceLevelStatusTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DimensionTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DimensionTests.java
index 035ac202a..035ac202a 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DimensionTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DimensionTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DirectionTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DirectionTests.java
index 76492878d..76492878d 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DirectionTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DirectionTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DisplayModeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DisplayModeTests.java
index 94387ef9a..94387ef9a 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DisplayModeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DisplayModeTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DisplayTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DisplayTypeTests.java
index 560bdf025..560bdf025 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DisplayTypeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DisplayTypeTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DistanceUnitTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DistanceUnitTests.java
index c421d6029..c421d6029 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DistanceUnitTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DistanceUnitTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DriverDistractionStateTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DriverDistractionStateTests.java
index 2d85caa21..2d85caa21 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DriverDistractionStateTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DriverDistractionStateTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ECallConfirmationStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ECallConfirmationStatusTests.java
index 9ce602ee1..9ce602ee1 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ECallConfirmationStatusTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ECallConfirmationStatusTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ElectronicParkBrakeStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ElectronicParkBrakeStatusTests.java
index bbeb1bce3..bbeb1bce3 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ElectronicParkBrakeStatusTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ElectronicParkBrakeStatusTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/EmergencyEventTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/EmergencyEventTypeTests.java
index 21823e4bd..21823e4bd 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/EmergencyEventTypeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/EmergencyEventTypeTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/FileTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/FileTypeTests.java
index 4db206cad..4db206cad 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/FileTypeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/FileTypeTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/FuelCutoffStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/FuelCutoffStatusTests.java
index 4900203f2..4900203f2 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/FuelCutoffStatusTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/FuelCutoffStatusTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/FuelTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/FuelTypeTests.java
index 525cc0316..525cc0316 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/FuelTypeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/FuelTypeTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/GlobalPropertyTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/GlobalPropertyTests.java
index fd7388a6c..fd7388a6c 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/GlobalPropertyTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/GlobalPropertyTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/HmiLevelTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/HmiLevelTests.java
index b64f9e42b..b64f9e42b 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/HmiLevelTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/HmiLevelTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/HmiZoneCapabilitiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/HmiZoneCapabilitiesTests.java
index ebe8227c2..ebe8227c2 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/HmiZoneCapabilitiesTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/HmiZoneCapabilitiesTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/HybridAppPreferenceTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/HybridAppPreferenceTests.java
index 89485a974..89485a974 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/HybridAppPreferenceTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/HybridAppPreferenceTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/IgnitionStableStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/IgnitionStableStatusTests.java
index fc9a8658a..fc9a8658a 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/IgnitionStableStatusTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/IgnitionStableStatusTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/IgnitionStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/IgnitionStatusTests.java
index 8fc1992ab..8fc1992ab 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/IgnitionStatusTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/IgnitionStatusTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ImageFieldNameTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ImageFieldNameTests.java
index aa2c1cbf1..aa2c1cbf1 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ImageFieldNameTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ImageFieldNameTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ImageTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ImageTypeTests.java
index fb3f609f3..fb3f609f3 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ImageTypeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ImageTypeTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/InteractionModeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/InteractionModeTests.java
index ab6490cea..ab6490cea 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/InteractionModeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/InteractionModeTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/JingleTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/JingleTests.java
index da5ea2836..da5ea2836 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/JingleTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/JingleTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/KeyboardEventTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/KeyboardEventTests.java
index 71448acf6..71448acf6 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/KeyboardEventTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/KeyboardEventTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/KeyboardLayoutTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/KeyboardLayoutTests.java
index 14d61aa51..14d61aa51 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/KeyboardLayoutTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/KeyboardLayoutTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/KeypressModeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/KeypressModeTests.java
index 8bd652969..8bd652969 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/KeypressModeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/KeypressModeTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LanguageTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LanguageTests.java
index 6b87c5d26..6b87c5d26 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LanguageTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LanguageTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LayoutModeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LayoutModeTests.java
index 904a39520..904a39520 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LayoutModeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LayoutModeTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LightNameTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LightNameTests.java
index 10df1e762..10df1e762 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LightNameTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LightNameTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LightStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LightStatusTests.java
index a97cd6eba..a97cd6eba 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LightStatusTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LightStatusTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LockScreenStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LockScreenStatusTests.java
index ed380d607..ed380d607 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LockScreenStatusTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LockScreenStatusTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MassageCushionTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MassageCushionTests.java
index e1f58ffef..e1f58ffef 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MassageCushionTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MassageCushionTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MassageModeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MassageModeTests.java
index 55e82ac21..55e82ac21 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MassageModeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MassageModeTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MassageZoneTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MassageZoneTests.java
index bbd543d4e..bbd543d4e 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MassageZoneTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MassageZoneTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MediaClockFormatTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MediaClockFormatTests.java
index 1895430e5..1895430e5 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MediaClockFormatTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MediaClockFormatTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MediaTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MediaTypeTests.java
index 835045418..835045418 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MediaTypeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MediaTypeTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MetadataTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MetadataTypeTests.java
index c381dfff3..c381dfff3 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MetadataTypeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MetadataTypeTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ModuleTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ModuleTypeTests.java
index 65432873e..65432873e 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ModuleTypeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ModuleTypeTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/NavigationActionTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/NavigationActionTests.java
index 5051ef337..5051ef337 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/NavigationActionTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/NavigationActionTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/NavigationJunctionTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/NavigationJunctionTests.java
index 691480f78..691480f78 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/NavigationJunctionTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/NavigationJunctionTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PowerModeQualificationStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PowerModeQualificationStatusTests.java
index f3a2a3540..f3a2a3540 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PowerModeQualificationStatusTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PowerModeQualificationStatusTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PowerModeStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PowerModeStatusTests.java
index 9154a06f0..9154a06f0 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PowerModeStatusTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PowerModeStatusTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PredefinedLayoutTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PredefinedLayoutTests.java
index 26b32d08b..26b32d08b 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PredefinedLayoutTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PredefinedLayoutTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PrerecordedSpeechTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PrerecordedSpeechTests.java
index 9ab3c9db8..9ab3c9db8 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PrerecordedSpeechTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PrerecordedSpeechTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PrimaryAudioSourceTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PrimaryAudioSourceTests.java
index b3432985d..b3432985d 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PrimaryAudioSourceTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PrimaryAudioSourceTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PrndlTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PrndlTests.java
index fabf94177..fabf94177 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PrndlTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PrndlTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/RadioBandTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/RadioBandTests.java
index cc5d5b700..cc5d5b700 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/RadioBandTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/RadioBandTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/RadioStateTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/RadioStateTests.java
index d16f00599..d16f00599 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/RadioStateTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/RadioStateTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/RequestTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/RequestTypeTests.java
index d00cfe93f..d00cfe93f 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/RequestTypeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/RequestTypeTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ResultTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ResultTests.java
index 4cea3acbe..4cea3acbe 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ResultTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ResultTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SamplingRateTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SamplingRateTests.java
index 062ce7df3..062ce7df3 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SamplingRateTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SamplingRateTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SdlDisconnectedReasonTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SdlDisconnectedReasonTests.java
index c0c06c251..c0c06c251 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SdlDisconnectedReasonTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SdlDisconnectedReasonTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SeatMemoryActionTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SeatMemoryActionTypeTests.java
index 2642e35d3..2642e35d3 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SeatMemoryActionTypeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SeatMemoryActionTypeTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ServiceUpdateReasonTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ServiceUpdateReasonTests.java
index f2484ff9e..f2484ff9e 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ServiceUpdateReasonTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ServiceUpdateReasonTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SoftButtonTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SoftButtonTypeTests.java
index d4ef5c0ff..d4ef5c0ff 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SoftButtonTypeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SoftButtonTypeTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SpeechCapabilitiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SpeechCapabilitiesTests.java
index 364f7c896..364f7c896 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SpeechCapabilitiesTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SpeechCapabilitiesTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/StaticIconNameTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/StaticIconNameTests.java
index b85905039..b85905039 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/StaticIconNameTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/StaticIconNameTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SupportedSeatTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SupportedSeatTests.java
index 6a2dbd18f..6a2dbd18f 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SupportedSeatTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SupportedSeatTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SystemActionTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SystemActionTests.java
index 807da0b8a..807da0b8a 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SystemActionTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SystemActionTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SystemCapabilityTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SystemCapabilityTypeTests.java
index f0f876d00..f0f876d00 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SystemCapabilityTypeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SystemCapabilityTypeTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SystemContextTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SystemContextTests.java
index 9b325492e..9b325492e 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SystemContextTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SystemContextTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TPMSTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TPMSTests.java
index c573a0d7a..c573a0d7a 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TPMSTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TPMSTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TbtStateTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TbtStateTests.java
index 1fbf8055a..1fbf8055a 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TbtStateTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TbtStateTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TextAlignmentTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TextAlignmentTests.java
index 1b1130806..1b1130806 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TextAlignmentTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TextAlignmentTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TextFieldNameTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TextFieldNameTests.java
index 7d0050e66..7d0050e66 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TextFieldNameTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TextFieldNameTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TouchTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TouchTypeTests.java
index db9c417ef..db9c417ef 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TouchTypeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TouchTypeTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TriggerSourceTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TriggerSourceTests.java
index 5197dec64..5197dec64 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TriggerSourceTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TriggerSourceTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TurnSignalTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TurnSignalTests.java
index a758d683e..a758d683e 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TurnSignalTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TurnSignalTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/UpdateModeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/UpdateModeTests.java
index 2c808ef03..2c808ef03 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/UpdateModeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/UpdateModeTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataEventStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataEventStatusTests.java
index bcee65b19..bcee65b19 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataEventStatusTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataEventStatusTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataNotificationStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataNotificationStatusTests.java
index af2f45714..af2f45714 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataNotificationStatusTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataNotificationStatusTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataResultCodeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataResultCodeTests.java
index e2161474a..e2161474a 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataResultCodeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataResultCodeTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataStatusTests.java
index d35780ff4..d35780ff4 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataStatusTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataStatusTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataTypeTests.java
index 56c418590..56c418590 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataTypeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataTypeTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VentilationModeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VentilationModeTests.java
index 561e66a77..561e66a77 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VentilationModeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VentilationModeTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VideoStreamingCodecTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VideoStreamingCodecTests.java
index b4aa8fd97..b4aa8fd97 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VideoStreamingCodecTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VideoStreamingCodecTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VideoStreamingProtocolTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VideoStreamingProtocolTests.java
index be50d2c30..be50d2c30 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VideoStreamingProtocolTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VideoStreamingProtocolTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VideoStreamingStateTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VideoStreamingStateTests.java
index 2074efe47..2074efe47 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VideoStreamingStateTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VideoStreamingStateTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VrCapabilitiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VrCapabilitiesTests.java
index 33da334b8..33da334b8 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VrCapabilitiesTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VrCapabilitiesTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/WarningLightStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/WarningLightStatusTests.java
index 18c6cc046..18c6cc046 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/WarningLightStatusTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/WarningLightStatusTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/WiperStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/WiperStatusTests.java
index 1ab3370fa..1ab3370fa 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/WiperStatusTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/WiperStatusTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnAppInterfaceUnregisteredTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnAppInterfaceUnregisteredTests.java
index e3c1ee32c..e3c1ee32c 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnAppInterfaceUnregisteredTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnAppInterfaceUnregisteredTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnAppServiceDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnAppServiceDataTests.java
index 108ec930f..108ec930f 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnAppServiceDataTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnAppServiceDataTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnAudioPassThruTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnAudioPassThruTests.java
index b2add2f34..b2add2f34 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnAudioPassThruTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnAudioPassThruTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnButtonEventTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnButtonEventTests.java
index 5f6e2e8e3..5f6e2e8e3 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnButtonEventTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnButtonEventTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnButtonPressTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnButtonPressTests.java
index be3c63be2..be3c63be2 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnButtonPressTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnButtonPressTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnCommandTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnCommandTests.java
index 46026f007..46026f007 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnCommandTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnCommandTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnDriverDistractionTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnDriverDistractionTests.java
index 090582586..090582586 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnDriverDistractionTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnDriverDistractionTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnErrorTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnErrorTests.java
index a907c8942..a907c8942 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnErrorTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnErrorTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnHMIStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnHMIStatusTests.java
index 6f38fdfa0..6f38fdfa0 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnHMIStatusTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnHMIStatusTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnHashChangeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnHashChangeTests.java
index 16e101860..16e101860 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnHashChangeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnHashChangeTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnInteriorVehicleDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnInteriorVehicleDataTests.java
index 4fded53fe..4fded53fe 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnInteriorVehicleDataTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnInteriorVehicleDataTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnKeyboardInputTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnKeyboardInputTests.java
index e950d85fa..e950d85fa 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnKeyboardInputTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnKeyboardInputTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnLanguageChangeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnLanguageChangeTests.java
index 382ef074c..382ef074c 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnLanguageChangeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnLanguageChangeTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnLockScreenStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnLockScreenStatusTests.java
index 8df1cb641..8df1cb641 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnLockScreenStatusTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnLockScreenStatusTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnPermissionsChangeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnPermissionsChangeTests.java
index c3d4c4f46..c3d4c4f46 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnPermissionsChangeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnPermissionsChangeTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnProxyClosedTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnProxyClosedTests.java
index defede878..defede878 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnProxyClosedTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnProxyClosedTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnProxyOpenedTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnProxyOpenedTests.java
index d186098c3..d186098c3 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnProxyOpenedTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnProxyOpenedTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnRCStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnRCStatusTests.java
index a6d4d63fd..a6d4d63fd 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnRCStatusTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnRCStatusTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnSdlChoiceChosenTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnSdlChoiceChosenTests.java
index 77d2cdb21..77d2cdb21 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnSdlChoiceChosenTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnSdlChoiceChosenTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnStreamRPCTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnStreamRPCTests.java
index 58db7d8eb..58db7d8eb 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnStreamRPCTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnStreamRPCTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnSystemCapabilityUpdatedTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnSystemCapabilityUpdatedTests.java
index ca0fa5f02..ca0fa5f02 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnSystemCapabilityUpdatedTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnSystemCapabilityUpdatedTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnSystemRequestTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnSystemRequestTests.java
index a4bb53e71..a4bb53e71 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnSystemRequestTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnSystemRequestTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnTBTClientStateTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnTBTClientStateTests.java
index 47352f6f5..47352f6f5 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnTBTClientStateTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnTBTClientStateTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnTouchEventTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnTouchEventTests.java
index 613afa55b..613afa55b 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnTouchEventTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnTouchEventTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnVehicleDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnVehicleDataTests.java
index c530c1278..c530c1278 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnVehicleDataTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnVehicleDataTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnWayPointChangeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnWayPointChangeTests.java
index dcc02dafd..dcc02dafd 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnWayPointChangeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnWayPointChangeTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AddCommandTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AddCommandTests.java
index f4864a52d..f4864a52d 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AddCommandTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AddCommandTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AddSubmenuTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AddSubmenuTests.java
index 6e73121f1..6e73121f1 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AddSubmenuTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AddSubmenuTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AlertManeuverTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AlertManeuverTests.java
index 83d8e1835..83d8e1835 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AlertManeuverTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AlertManeuverTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AlertTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AlertTests.java
index 21a33aac0..21a33aac0 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AlertTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AlertTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ButtonPressTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ButtonPressTests.java
index f16a3a87c..f16a3a87c 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ButtonPressTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ButtonPressTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ChangeRegistrationTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ChangeRegistrationTests.java
index 37ae9e6f9..37ae9e6f9 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ChangeRegistrationTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ChangeRegistrationTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/CreateInteractionChoiceSetTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/CreateInteractionChoiceSetTests.java
index 168666dcb..168666dcb 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/CreateInteractionChoiceSetTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/CreateInteractionChoiceSetTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteCommandTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteCommandTests.java
index 43af829e4..43af829e4 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteCommandTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteCommandTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteFileTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteFileTests.java
index 8d8300e0c..8d8300e0c 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteFileTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteFileTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteInteractionChoiceSetTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteInteractionChoiceSetTests.java
index b9b1bbc15..b9b1bbc15 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteInteractionChoiceSetTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteInteractionChoiceSetTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteSubMenuTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteSubMenuTests.java
index db9e06e12..db9e06e12 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteSubMenuTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteSubMenuTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DiagnosticMessageTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DiagnosticMessageTests.java
index 4ee758c3d..4ee758c3d 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DiagnosticMessageTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DiagnosticMessageTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DialNumberTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DialNumberTests.java
index 40a8d432f..40a8d432f 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DialNumberTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DialNumberTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/EndAudioPassThruTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/EndAudioPassThruTests.java
index 448f592ed..448f592ed 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/EndAudioPassThruTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/EndAudioPassThruTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetAppServiceDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetAppServiceDataTests.java
index abda43557..abda43557 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetAppServiceDataTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetAppServiceDataTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetCloudAppPropertiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetCloudAppPropertiesTests.java
index 423e53add..423e53add 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetCloudAppPropertiesTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetCloudAppPropertiesTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetDTCsTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetDTCsTests.java
index 1d5cbcad1..1d5cbcad1 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetDTCsTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetDTCsTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetFileTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetFileTests.java
index 48214373d..48214373d 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetFileTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetFileTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetInteriorVehicleDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetInteriorVehicleDataTests.java
index 5a08d4266..5a08d4266 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetInteriorVehicleDataTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetInteriorVehicleDataTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetSystemCapabilityTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetSystemCapabilityTests.java
index 290a291d1..290a291d1 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetSystemCapabilityTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetSystemCapabilityTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetVehicleDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetVehicleDataTests.java
index 54f299fdf..54f299fdf 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetVehicleDataTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetVehicleDataTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetWayPointsTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetWayPointsTests.java
index bf0531685..bf0531685 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetWayPointsTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetWayPointsTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ListFilesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ListFilesTests.java
index 31d20bacf..31d20bacf 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ListFilesTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ListFilesTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformAppServiceInteractionTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformAppServiceInteractionTests.java
index c5be9b14f..c5be9b14f 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformAppServiceInteractionTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformAppServiceInteractionTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformAudioPassThruTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformAudioPassThruTests.java
index d3ecbdfeb..d3ecbdfeb 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformAudioPassThruTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformAudioPassThruTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformInteractionTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformInteractionTests.java
index 9ea36f43f..9ea36f43f 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformInteractionTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformInteractionTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PublishAppServiceTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PublishAppServiceTests.java
index 6d0d67490..6d0d67490 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PublishAppServiceTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PublishAppServiceTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PutFileTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PutFileTests.java
index 7b6ce75e5..7b6ce75e5 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PutFileTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PutFileTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ReadDidTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ReadDidTests.java
index 477acc1aa..477acc1aa 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ReadDidTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ReadDidTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/RegisterAppInterfaceTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/RegisterAppInterfaceTests.java
index 85b6f28ea..85b6f28ea 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/RegisterAppInterfaceTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/RegisterAppInterfaceTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ResetGlobalPropertiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ResetGlobalPropertiesTests.java
index dc4fda730..dc4fda730 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ResetGlobalPropertiesTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ResetGlobalPropertiesTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ScrollableMessageTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ScrollableMessageTests.java
index f7bca8e78..f7bca8e78 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ScrollableMessageTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ScrollableMessageTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SendHapticDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SendHapticDataTests.java
index 7c3b0ed90..7c3b0ed90 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SendHapticDataTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SendHapticDataTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SendLocationTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SendLocationTests.java
index ee9a93750..ee9a93750 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SendLocationTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SendLocationTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetAppIconTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetAppIconTests.java
index c9286b763..c9286b763 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetAppIconTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetAppIconTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetCloudAppPropertiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetCloudAppPropertiesTests.java
index ea817c85e..ea817c85e 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetCloudAppPropertiesTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetCloudAppPropertiesTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetDisplayLayoutTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetDisplayLayoutTests.java
index d0ccc6fc7..d0ccc6fc7 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetDisplayLayoutTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetDisplayLayoutTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetGlobalPropertiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetGlobalPropertiesTests.java
index 5f791769b..5f791769b 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetGlobalPropertiesTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetGlobalPropertiesTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetInteriorVehicleDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetInteriorVehicleDataTests.java
index f5ecb0d06..f5ecb0d06 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetInteriorVehicleDataTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetInteriorVehicleDataTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetMediaClockTimerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetMediaClockTimerTests.java
index 8083c65ed..8083c65ed 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetMediaClockTimerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetMediaClockTimerTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ShowConstantTbtTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ShowConstantTbtTests.java
index a6be52608..a6be52608 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ShowConstantTbtTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ShowConstantTbtTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ShowTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ShowTests.java
index 9c7a681df..9c7a681df 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ShowTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ShowTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SliderTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SliderTests.java
index 7c53681b9..7c53681b9 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SliderTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SliderTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SpeakTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SpeakTests.java
index 2051b99f2..2051b99f2 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SpeakTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SpeakTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeButtonTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeButtonTests.java
index 4cb3e4b53..4cb3e4b53 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeButtonTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeButtonTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeVehicleDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeVehicleDataTests.java
index ce93c52ea..ce93c52ea 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeVehicleDataTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeVehicleDataTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeWayPointsTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeWayPointsTests.java
index 06b6ee330..06b6ee330 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeWayPointsTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeWayPointsTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SystemRequestTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SystemRequestTests.java
index 9ca720198..9ca720198 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SystemRequestTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SystemRequestTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnregisterAppInterfaceTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnregisterAppInterfaceTests.java
index 84607ee98..84607ee98 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnregisterAppInterfaceTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnregisterAppInterfaceTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeButtonTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeButtonTests.java
index 789c8758a..789c8758a 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeButtonTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeButtonTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeVehicleDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeVehicleDataTests.java
index af8560410..af8560410 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeVehicleDataTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeVehicleDataTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeWayPointsTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeWayPointsTests.java
index ac4afbbea..ac4afbbea 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeWayPointsTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeWayPointsTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UpdateTurnListTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UpdateTurnListTests.java
index f600e559b..f600e559b 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UpdateTurnListTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UpdateTurnListTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AddCommandResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AddCommandResponseTests.java
index efde2292d..efde2292d 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AddCommandResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AddCommandResponseTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AddSubmenuResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AddSubmenuResponseTests.java
index 2a3888de7..2a3888de7 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AddSubmenuResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AddSubmenuResponseTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AlertManeuverResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AlertManeuverResponseTests.java
index 64b3ff5f3..64b3ff5f3 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AlertManeuverResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AlertManeuverResponseTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AlertResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AlertResponseTests.java
index a479da245..a479da245 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AlertResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AlertResponseTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ButtonPressResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ButtonPressResponseTest.java
index 64f5b0c75..64f5b0c75 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ButtonPressResponseTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ButtonPressResponseTest.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ChangeRegistrationResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ChangeRegistrationResponseTests.java
index 906533bfd..906533bfd 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ChangeRegistrationResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ChangeRegistrationResponseTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/CreateInteractionChoiceSetResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/CreateInteractionChoiceSetResponseTests.java
index f492d0458..f492d0458 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/CreateInteractionChoiceSetResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/CreateInteractionChoiceSetResponseTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteCommandResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteCommandResponseTests.java
index f40dbc895..f40dbc895 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteCommandResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteCommandResponseTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteFileResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteFileResponseTests.java
index 2c4ecb01f..2c4ecb01f 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteFileResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteFileResponseTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteInteractionChoiceSetResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteInteractionChoiceSetResponseTests.java
index e1b6233c0..e1b6233c0 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteInteractionChoiceSetResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteInteractionChoiceSetResponseTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteSubMenuResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteSubMenuResponseTests.java
index 46fea52e0..46fea52e0 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteSubMenuResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteSubMenuResponseTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DiagnosticMessageResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DiagnosticMessageResponseTests.java
index 2732d79b2..2732d79b2 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DiagnosticMessageResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DiagnosticMessageResponseTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DialNumberResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DialNumberResponseTests.java
index bf625f19a..bf625f19a 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DialNumberResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DialNumberResponseTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/EndAudioPassThruResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/EndAudioPassThruResponseTests.java
index c50e39569..c50e39569 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/EndAudioPassThruResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/EndAudioPassThruResponseTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GenericResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GenericResponseTests.java
index f80c6201b..f80c6201b 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GenericResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GenericResponseTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetAppServiceDataResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetAppServiceDataResponseTests.java
index 08a8f6536..08a8f6536 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetAppServiceDataResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetAppServiceDataResponseTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetCloudAppPropertiesResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetCloudAppPropertiesResponseTests.java
index e082c82f9..e082c82f9 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetCloudAppPropertiesResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetCloudAppPropertiesResponseTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetDTCsResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetDTCsResponseTests.java
index 0a82ccd75..0a82ccd75 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetDTCsResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetDTCsResponseTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetFileResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetFileResponseTests.java
index 25ba20949..25ba20949 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetFileResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetFileResponseTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetInteriorVehicleDataResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetInteriorVehicleDataResponseTests.java
index c76388c69..c76388c69 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetInteriorVehicleDataResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetInteriorVehicleDataResponseTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetSystemCapabilityResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetSystemCapabilityResponseTests.java
index b9fd85a8e..b9fd85a8e 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetSystemCapabilityResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetSystemCapabilityResponseTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetVehicleDataResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetVehicleDataResponseTests.java
index 2bcff82ee..2bcff82ee 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetVehicleDataResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetVehicleDataResponseTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetWayPointsResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetWayPointsResponseTests.java
index 57d8499df..57d8499df 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetWayPointsResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetWayPointsResponseTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ListFilesResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ListFilesResponseTests.java
index 878a47776..878a47776 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ListFilesResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ListFilesResponseTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PerformAppServiceInteractionResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PerformAppServiceInteractionResponseTests.java
index ac3be00c6..ac3be00c6 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PerformAppServiceInteractionResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PerformAppServiceInteractionResponseTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PerformAudioPassThruResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PerformAudioPassThruResponseTest.java
index b330fed72..b330fed72 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PerformAudioPassThruResponseTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PerformAudioPassThruResponseTest.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PerformInteractionResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PerformInteractionResponseTest.java
index d3f1518af..d3f1518af 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PerformInteractionResponseTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PerformInteractionResponseTest.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PublishAppServiceResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PublishAppServiceResponseTests.java
index f51a7945a..f51a7945a 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PublishAppServiceResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PublishAppServiceResponseTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PutFileResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PutFileResponseTest.java
index 150994180..150994180 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PutFileResponseTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PutFileResponseTest.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ReadDIDResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ReadDIDResponseTest.java
index 3ffc857cc..3ffc857cc 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ReadDIDResponseTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ReadDIDResponseTest.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/RegisterAppInterfaceResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/RegisterAppInterfaceResponseTest.java
index 55450898e..55450898e 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/RegisterAppInterfaceResponseTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/RegisterAppInterfaceResponseTest.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ResetGlobalPropertiesResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ResetGlobalPropertiesResponseTest.java
index 7e2faa3e4..7e2faa3e4 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ResetGlobalPropertiesResponseTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ResetGlobalPropertiesResponseTest.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ScrollableMessageResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ScrollableMessageResponseTest.java
index 7c7ad5edf..7c7ad5edf 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ScrollableMessageResponseTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ScrollableMessageResponseTest.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SendLocationResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SendLocationResponseTests.java
index c15607cec..c15607cec 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SendLocationResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SendLocationResponseTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetAppIconResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetAppIconResponseTest.java
index 977998047..977998047 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetAppIconResponseTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetAppIconResponseTest.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetCloudAppPropertiesResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetCloudAppPropertiesResponseTests.java
index 894c7ee78..894c7ee78 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetCloudAppPropertiesResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetCloudAppPropertiesResponseTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetDisplayLayoutResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetDisplayLayoutResponseTest.java
index 2f188ff3b..2f188ff3b 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetDisplayLayoutResponseTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetDisplayLayoutResponseTest.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetGlobalPropertiesResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetGlobalPropertiesResponseTest.java
index ed2c894c8..ed2c894c8 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetGlobalPropertiesResponseTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetGlobalPropertiesResponseTest.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetInteriorVehicleDataResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetInteriorVehicleDataResponseTests.java
index c25685157..c25685157 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetInteriorVehicleDataResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetInteriorVehicleDataResponseTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetMediaClockTimerResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetMediaClockTimerResponseTest.java
index 6cf9d2977..6cf9d2977 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetMediaClockTimerResponseTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetMediaClockTimerResponseTest.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ShowConstantTbtResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ShowConstantTbtResponseTests.java
index f51739ee9..f51739ee9 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ShowConstantTbtResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ShowConstantTbtResponseTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ShowResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ShowResponseTest.java
index 301e330e7..301e330e7 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ShowResponseTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ShowResponseTest.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SliderResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SliderResponseTest.java
index 4f9b5be98..4f9b5be98 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SliderResponseTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SliderResponseTest.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SpeakResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SpeakResponseTest.java
index 3488aeae6..3488aeae6 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SpeakResponseTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SpeakResponseTest.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/StreamRPCResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/StreamRPCResponseTests.java
index 47801ea90..47801ea90 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/StreamRPCResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/StreamRPCResponseTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeButtonResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeButtonResponseTest.java
index 6eaa9f397..6eaa9f397 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeButtonResponseTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeButtonResponseTest.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeVehicleDataResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeVehicleDataResponseTest.java
index e1dfc603c..e1dfc603c 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeVehicleDataResponseTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeVehicleDataResponseTest.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeWaypointsResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeWaypointsResponseTests.java
index a43220dce..a43220dce 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeWaypointsResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeWaypointsResponseTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SystemRequestResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SystemRequestResponseTest.java
index 80684a04a..80684a04a 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SystemRequestResponseTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SystemRequestResponseTest.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnregisterAppInterfaceResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnregisterAppInterfaceResponseTest.java
index 7d2fc1645..7d2fc1645 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnregisterAppInterfaceResponseTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnregisterAppInterfaceResponseTest.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeButtonResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeButtonResponseTest.java
index 384c5df57..384c5df57 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeButtonResponseTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeButtonResponseTest.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeVehicleDataResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeVehicleDataResponseTest.java
index cba7fcf0d..cba7fcf0d 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeVehicleDataResponseTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeVehicleDataResponseTest.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeWayPointsResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeWayPointsResponseTests.java
index b8b69be60..b8b69be60 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeWayPointsResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeWayPointsResponseTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UpdateTurnListResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UpdateTurnListResponseTests.java
index 757f3b185..757f3b185 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UpdateTurnListResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UpdateTurnListResponseTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/security/SdlSecurityBaseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/security/SdlSecurityBaseTest.java
index 82a042b81..82a042b81 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/security/SdlSecurityBaseTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/security/SdlSecurityBaseTest.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/AbstractPacketizerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/AbstractPacketizerTests.java
index c74e8ab84..c74e8ab84 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/AbstractPacketizerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/AbstractPacketizerTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/MockInterfaceBroker.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/MockInterfaceBroker.java
index f548560a9..f548560a9 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/MockInterfaceBroker.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/MockInterfaceBroker.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/MockPacketizer.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/MockPacketizer.java
index 2c6618f62..2c6618f62 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/MockPacketizer.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/MockPacketizer.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/MockStreamListener.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/MockStreamListener.java
index 0081c65ea..0081c65ea 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/MockStreamListener.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/MockStreamListener.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/StreamPacketizerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/StreamPacketizerTests.java
index 5f5bd6d2b..5f5bd6d2b 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/StreamPacketizerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/StreamPacketizerTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/StreamRPCPacketizerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/StreamRPCPacketizerTests.java
index 0f72eec95..0f72eec95 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/StreamRPCPacketizerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/StreamRPCPacketizerTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/video/RTPH264PacketizerTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/video/RTPH264PacketizerTest.java
index 7090ba8e8..7090ba8e8 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/video/RTPH264PacketizerTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/video/RTPH264PacketizerTest.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/video/SdlRemoteDisplayTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/video/SdlRemoteDisplayTest.java
index 453239bca..453239bca 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/video/SdlRemoteDisplayTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/video/SdlRemoteDisplayTest.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/DiagLevelTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/DiagLevelTests.java
index ce24ce4e8..ce24ce4e8 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/DiagLevelTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/DiagLevelTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/MimeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/MimeTests.java
index a39e87393..a39e87393 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/MimeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/MimeTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/SdlTraceTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/SdlTraceTests.java
index 8cec7f332..8cec7f332 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/SdlTraceTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/SdlTraceTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/enums/DetailLevelTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/enums/DetailLevelTests.java
index 615f0af4c..615f0af4c 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/enums/DetailLevelTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/enums/DetailLevelTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/enums/InterfaceActivityDirectionTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/enums/InterfaceActivityDirectionTests.java
index 4086788e6..4086788e6 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/enums/InterfaceActivityDirectionTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/enums/InterfaceActivityDirectionTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/enums/ModTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/enums/ModTests.java
index 917960506..917960506 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/enums/ModTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/enums/ModTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/BTTransportConfigTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/BTTransportConfigTests.java
index 11b6ab39f..11b6ab39f 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/BTTransportConfigTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/BTTransportConfigTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/BaseTransportConfigTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/BaseTransportConfigTests.java
index c23b820eb..c23b820eb 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/BaseTransportConfigTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/BaseTransportConfigTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/MultiplexBluetoothTransportTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/MultiplexBluetoothTransportTest.java
index cdf83079c..cdf83079c 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/MultiplexBluetoothTransportTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/MultiplexBluetoothTransportTest.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/MultiplexTransportConfigTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/MultiplexTransportConfigTests.java
index cb3de5670..cb3de5670 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/MultiplexTransportConfigTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/MultiplexTransportConfigTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/SdlPsmTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/SdlPsmTests.java
index fe61af6f1..fe61af6f1 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/SdlPsmTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/SdlPsmTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/TCPTransportConfigTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/TCPTransportConfigTests.java
index f08deea5a..f08deea5a 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/TCPTransportConfigTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/TCPTransportConfigTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/TransportTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/TransportTypeTests.java
index 7e3b894e5..7e3b894e5 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/TransportTypeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/TransportTypeTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/WiFiSocketFactoryTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/WiFiSocketFactoryTest.java
index ab2b7b52d..ab2b7b52d 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/WiFiSocketFactoryTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/WiFiSocketFactoryTest.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/BitConverterTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/BitConverterTests.java
index fb6eed3f9..fb6eed3f9 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/BitConverterTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/BitConverterTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/ByteEnumerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/ByteEnumerTests.java
index 7dcb1b3e8..7dcb1b3e8 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/ByteEnumerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/ByteEnumerTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/DebugToolTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/DebugToolTests.java
index e694a6747..e694a6747 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/DebugToolTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/DebugToolTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/DeviceUtil.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/DeviceUtil.java
index 389403eaf..389403eaf 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/DeviceUtil.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/DeviceUtil.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/NativeLogToolTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/NativeLogToolTests.java
index fd09c6d76..fd09c6d76 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/NativeLogToolTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/NativeLogToolTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/SdlAppInfoTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/SdlAppInfoTests.java
index 027de8b2c..027de8b2c 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/SdlAppInfoTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/SdlAppInfoTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/SdlDataTypeConverterTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/SdlDataTypeConverterTests.java
index b39c405d5..b39c405d5 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/SdlDataTypeConverterTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/SdlDataTypeConverterTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/VersionTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/VersionTest.java
index 4798de56b..4798de56b 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/VersionTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/VersionTest.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/utl/AndroidToolsTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/utl/AndroidToolsTests.java
index c715bb62c..c715bb62c 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/utl/AndroidToolsTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/utl/AndroidToolsTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/transport/LocalRouterServiceTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/LocalRouterServiceTests.java
index 10aa25d75..10aa25d75 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/transport/LocalRouterServiceTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/LocalRouterServiceTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/transport/MultiplexTransportTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/MultiplexTransportTest.java
index 9551a5a6f..9551a5a6f 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/transport/MultiplexTransportTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/MultiplexTransportTest.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/transport/RSVTestCase.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/RSVTestCase.java
index b19a0c6ce..b19a0c6ce 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/transport/RSVTestCase.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/RSVTestCase.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/transport/RegisteredAppTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/RegisteredAppTests.java
index 89dbae3ab..89dbae3ab 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/transport/RegisteredAppTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/RegisteredAppTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/transport/SdlRouterServiceTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/SdlRouterServiceTests.java
index 12fc1fb6e..12fc1fb6e 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/transport/SdlRouterServiceTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/SdlRouterServiceTests.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/transport/TransportBrokerTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/TransportBrokerTest.java
index ac97857ad..ac97857ad 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/transport/TransportBrokerTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/TransportBrokerTest.java
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/transport/TransportManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/TransportManagerTests.java
index bdb628e05..bdb628e05 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/transport/TransportManagerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/TransportManagerTests.java
diff --git a/sdl_android/src/androidTest/res/raw/test_audio_square_250hz_80amp_1s.mp3 b/android/sdl_android/src/androidTest/res/raw/test_audio_square_250hz_80amp_1s.mp3
index 6108d27ec..6108d27ec 100644
--- a/sdl_android/src/androidTest/res/raw/test_audio_square_250hz_80amp_1s.mp3
+++ b/android/sdl_android/src/androidTest/res/raw/test_audio_square_250hz_80amp_1s.mp3
Binary files differ
diff --git a/sdl_android/src/main/AndroidManifest.xml b/android/sdl_android/src/main/AndroidManifest.xml
index 32a1590e5..32a1590e5 100644
--- a/sdl_android/src/main/AndroidManifest.xml
+++ b/android/sdl_android/src/main/AndroidManifest.xml
diff --git a/sdl_android/src/main/aidl/com/smartdevicelink/protocol/SdlPacket.aidl b/android/sdl_android/src/main/aidl/com/smartdevicelink/protocol/SdlPacket.aidl
index cec80021e..cec80021e 100644
--- a/sdl_android/src/main/aidl/com/smartdevicelink/protocol/SdlPacket.aidl
+++ b/android/sdl_android/src/main/aidl/com/smartdevicelink/protocol/SdlPacket.aidl
diff --git a/sdl_android/src/main/java/com/smartdevicelink/Dispatcher/IDispatchingStrategy.java b/android/sdl_android/src/main/java/com/smartdevicelink/Dispatcher/IDispatchingStrategy.java
index a4cfc150b..a4cfc150b 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/Dispatcher/IDispatchingStrategy.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/Dispatcher/IDispatchingStrategy.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/Dispatcher/ProxyMessageDispatcher.java b/android/sdl_android/src/main/java/com/smartdevicelink/Dispatcher/ProxyMessageDispatcher.java
index 8db6f51e7..8db6f51e7 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/Dispatcher/ProxyMessageDispatcher.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/Dispatcher/ProxyMessageDispatcher.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/SdlConnection/ISdlConnectionListener.java b/android/sdl_android/src/main/java/com/smartdevicelink/SdlConnection/ISdlConnectionListener.java
index 627c6eca9..627c6eca9 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/SdlConnection/ISdlConnectionListener.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/SdlConnection/ISdlConnectionListener.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/SdlConnection/SdlConnection.java b/android/sdl_android/src/main/java/com/smartdevicelink/SdlConnection/SdlConnection.java
index f67ac66af..f67ac66af 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/SdlConnection/SdlConnection.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/SdlConnection/SdlConnection.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/SdlConnection/SdlSession.java b/android/sdl_android/src/main/java/com/smartdevicelink/SdlConnection/SdlSession.java
index 44df5f64c..44df5f64c 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/SdlConnection/SdlSession.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/SdlConnection/SdlSession.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/SdlConnection/SdlSession2.java b/android/sdl_android/src/main/java/com/smartdevicelink/SdlConnection/SdlSession2.java
index 913c8d5ee..913c8d5ee 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/SdlConnection/SdlSession2.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/SdlConnection/SdlSession2.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/encoder/EncoderUtils.java b/android/sdl_android/src/main/java/com/smartdevicelink/encoder/EncoderUtils.java
index 362564da8..362564da8 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/encoder/EncoderUtils.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/encoder/EncoderUtils.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/encoder/SdlEncoder.java b/android/sdl_android/src/main/java/com/smartdevicelink/encoder/SdlEncoder.java
index 6c9198cb4..6c9198cb4 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/encoder/SdlEncoder.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/encoder/SdlEncoder.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/encoder/VirtualDisplayEncoder.java b/android/sdl_android/src/main/java/com/smartdevicelink/encoder/VirtualDisplayEncoder.java
index 6b7f2a686..6b7f2a686 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/encoder/VirtualDisplayEncoder.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/encoder/VirtualDisplayEncoder.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/exception/SdlException.java b/android/sdl_android/src/main/java/com/smartdevicelink/exception/SdlException.java
index a67549515..a67549515 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/exception/SdlException.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/exception/SdlException.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/exception/SdlExceptionCause.java b/android/sdl_android/src/main/java/com/smartdevicelink/exception/SdlExceptionCause.java
index 4894ceca3..4894ceca3 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/exception/SdlExceptionCause.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/exception/SdlExceptionCause.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/haptic/HapticInterfaceManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/haptic/HapticInterfaceManager.java
index 9a6e44897..9a6e44897 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/haptic/HapticInterfaceManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/haptic/HapticInterfaceManager.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/managers/BaseSubManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/BaseSubManager.java
index 6475b481e..6475b481e 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/managers/BaseSubManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/BaseSubManager.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/managers/CompletionListener.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/CompletionListener.java
index 93e618dae..93e618dae 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/managers/CompletionListener.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/CompletionListener.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/managers/ProxyBridge.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/ProxyBridge.java
index c01a5769c..c01a5769c 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/managers/ProxyBridge.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/ProxyBridge.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManager.java
index 7b51e8ecc..7b51e8ecc 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManager.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManagerListener.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManagerListener.java
index 22a3fcd58..22a3fcd58 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManagerListener.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManagerListener.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/managers/StreamingStateMachine.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/StreamingStateMachine.java
index caabf67a2..caabf67a2 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/managers/StreamingStateMachine.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/StreamingStateMachine.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioDecoder.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioDecoder.java
index c80ebba39..c80ebba39 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioDecoder.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioDecoder.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioDecoderCompat.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioDecoderCompat.java
index 43daef4b3..43daef4b3 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioDecoderCompat.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioDecoderCompat.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioDecoderListener.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioDecoderListener.java
index d8dcc1238..d8dcc1238 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioDecoderListener.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioDecoderListener.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioStreamManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioStreamManager.java
index 641a2dcaf..641a2dcaf 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioStreamManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioStreamManager.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/managers/audio/BaseAudioDecoder.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/BaseAudioDecoder.java
index 22a54a172..22a54a172 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/managers/audio/BaseAudioDecoder.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/BaseAudioDecoder.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/managers/audio/SampleBuffer.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/SampleBuffer.java
index 6ae5c6266..6ae5c6266 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/managers/audio/SampleBuffer.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/SampleBuffer.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/managers/file/FileManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/file/FileManager.java
index 61d049832..61d049832 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/managers/file/FileManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/file/FileManager.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/managers/file/MultipleFileCompletionListener.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/file/MultipleFileCompletionListener.java
index 803c54f64..803c54f64 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/managers/file/MultipleFileCompletionListener.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/file/MultipleFileCompletionListener.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlArtwork.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlArtwork.java
index 664376d7b..664376d7b 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlArtwork.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlArtwork.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlFile.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlFile.java
index 71eaa22fd..71eaa22fd 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlFile.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlFile.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/managers/lifecycle/RpcConverter.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lifecycle/RpcConverter.java
index 07b5ccc25..07b5ccc25 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/managers/lifecycle/RpcConverter.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lifecycle/RpcConverter.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenConfig.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenConfig.java
index ce571daeb..ce571daeb 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenConfig.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenConfig.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenManager.java
index 4bd2f229f..4bd2f229f 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenManager.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/SDLLockScreenActivity.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/SDLLockScreenActivity.java
index b99cc0d05..b99cc0d05 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/SDLLockScreenActivity.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/SDLLockScreenActivity.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/managers/permission/OnPermissionChangeListener.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/permission/OnPermissionChangeListener.java
index 45035b91a..45035b91a 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/managers/permission/OnPermissionChangeListener.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/permission/OnPermissionChangeListener.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/managers/permission/PermissionElement.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/permission/PermissionElement.java
index edb3788b6..edb3788b6 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/managers/permission/PermissionElement.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/permission/PermissionElement.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/managers/permission/PermissionFilter.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/permission/PermissionFilter.java
index de7aab01a..de7aab01a 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/managers/permission/PermissionFilter.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/permission/PermissionFilter.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/managers/permission/PermissionManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/permission/PermissionManager.java
index 0c0ea2b6e..0c0ea2b6e 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/managers/permission/PermissionManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/permission/PermissionManager.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/managers/permission/PermissionStatus.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/permission/PermissionStatus.java
index 11f464552..11f464552 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/managers/permission/PermissionStatus.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/permission/PermissionStatus.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/managers/screen/ScreenManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/ScreenManager.java
index 44347f43b..44347f43b 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/managers/screen/ScreenManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/ScreenManager.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/managers/screen/SoftButtonManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/SoftButtonManager.java
index d6bd49e67..d6bd49e67 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/managers/screen/SoftButtonManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/SoftButtonManager.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/managers/screen/SoftButtonObject.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/SoftButtonObject.java
index 01c760d09..01c760d09 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/managers/screen/SoftButtonObject.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/SoftButtonObject.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/managers/screen/SoftButtonState.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/SoftButtonState.java
index d6c81ada9..d6c81ada9 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/managers/screen/SoftButtonState.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/SoftButtonState.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/managers/screen/TextAndGraphicManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/TextAndGraphicManager.java
index 1f2b8b4d1..1f2b8b4d1 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/managers/screen/TextAndGraphicManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/TextAndGraphicManager.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/managers/video/VideoStreamManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/video/VideoStreamManager.java
index 1e84531bd..1e84531bd 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/managers/video/VideoStreamManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/video/VideoStreamManager.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/marshal/JsonRPCMarshaller.java b/android/sdl_android/src/main/java/com/smartdevicelink/marshal/JsonRPCMarshaller.java
index 89f4d1ef7..89f4d1ef7 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/marshal/JsonRPCMarshaller.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/marshal/JsonRPCMarshaller.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/protocol/AbstractProtocol.java b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/AbstractProtocol.java
index 043f7e994..043f7e994 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/protocol/AbstractProtocol.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/AbstractProtocol.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/protocol/BinaryFrameHeader.java b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/BinaryFrameHeader.java
index 5848b9f5a..5848b9f5a 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/protocol/BinaryFrameHeader.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/BinaryFrameHeader.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/protocol/IProtocolListener.java b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/IProtocolListener.java
index e0c6808e1..e0c6808e1 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/protocol/IProtocolListener.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/IProtocolListener.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/protocol/ISdlProtocol.java b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/ISdlProtocol.java
index 32a21ec2a..32a21ec2a 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/protocol/ISdlProtocol.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/ISdlProtocol.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/protocol/ISecondaryTransportListener.java b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/ISecondaryTransportListener.java
index 17db7ad11..17db7ad11 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/protocol/ISecondaryTransportListener.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/ISecondaryTransportListener.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/protocol/ProtocolMessage.java b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/ProtocolMessage.java
index cb5ad3a74..cb5ad3a74 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/protocol/ProtocolMessage.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/ProtocolMessage.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlPacket.java b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlPacket.java
index b635ab3f5..b635ab3f5 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlPacket.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlPacket.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlPacketFactory.java b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlPacketFactory.java
index 5a8500336..5a8500336 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlPacketFactory.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlPacketFactory.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlProtocol.java b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlProtocol.java
index 55715637f..55715637f 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlProtocol.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlProtocol.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/protocol/WiProProtocol.java b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/WiProProtocol.java
index 7edb4ea29..7edb4ea29 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/protocol/WiProProtocol.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/WiProProtocol.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/protocol/enums/ControlFrameTags.java b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/enums/ControlFrameTags.java
index 0dd46ecfd..0dd46ecfd 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/protocol/enums/ControlFrameTags.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/enums/ControlFrameTags.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/protocol/enums/FrameData.java b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/enums/FrameData.java
index bff606c3b..bff606c3b 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/protocol/enums/FrameData.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/enums/FrameData.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/protocol/enums/FrameDataControlFrameType.java b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/enums/FrameDataControlFrameType.java
index bef31fe5c..bef31fe5c 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/protocol/enums/FrameDataControlFrameType.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/enums/FrameDataControlFrameType.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/protocol/enums/FrameType.java b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/enums/FrameType.java
index d724807d0..d724807d0 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/protocol/enums/FrameType.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/enums/FrameType.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/protocol/enums/FunctionID.java b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/enums/FunctionID.java
index 4fd4d1d73..4fd4d1d73 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/protocol/enums/FunctionID.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/enums/FunctionID.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/protocol/enums/MessageType.java b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/enums/MessageType.java
index 87f5b9eb3..87f5b9eb3 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/protocol/enums/MessageType.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/enums/MessageType.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/protocol/enums/SessionType.java b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/enums/SessionType.java
index f6cd888b4..f6cd888b4 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/protocol/enums/SessionType.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/enums/SessionType.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/protocol/heartbeat/HeartbeatMonitor.java b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/heartbeat/HeartbeatMonitor.java
index 0b7051c27..0b7051c27 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/protocol/heartbeat/HeartbeatMonitor.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/heartbeat/HeartbeatMonitor.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/protocol/heartbeat/IHeartbeatMonitor.java b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/heartbeat/IHeartbeatMonitor.java
index ff4feb9cb..ff4feb9cb 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/protocol/heartbeat/IHeartbeatMonitor.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/heartbeat/IHeartbeatMonitor.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/protocol/heartbeat/IHeartbeatMonitorListener.java b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/heartbeat/IHeartbeatMonitorListener.java
index 584115f21..584115f21 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/protocol/heartbeat/IHeartbeatMonitorListener.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/heartbeat/IHeartbeatMonitorListener.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/IProxyListener.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/IProxyListener.java
index 2ef06c3b9..2ef06c3b9 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/IProxyListener.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/IProxyListener.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/LockScreenManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/LockScreenManager.java
index 28b1d3dfb..28b1d3dfb 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/LockScreenManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/LockScreenManager.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCMessage.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCMessage.java
index e55292aad..e55292aad 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCMessage.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCMessage.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCNotification.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCNotification.java
index b9992e78b..b9992e78b 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCNotification.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCNotification.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCRequest.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCRequest.java
index e6a92924e..e6a92924e 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCRequest.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCRequest.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCRequestFactory.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCRequestFactory.java
index 7f9986822..7f9986822 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCRequestFactory.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCRequestFactory.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCResponse.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCResponse.java
index a7c0ed188..a7c0ed188 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCResponse.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCResponse.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCStreamController.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCStreamController.java
index 0e2af0bc6..0e2af0bc6 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCStreamController.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCStreamController.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCStruct.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCStruct.java
index 433c20553..433c20553 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCStruct.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCStruct.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyALM.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyALM.java
index d3690146c..d3690146c 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyALM.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyALM.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java
index 2535178f0..2535178f0 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBuilder.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBuilder.java
index 42e2fbbc2..42e2fbbc2 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBuilder.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBuilder.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyConfigurationResources.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyConfigurationResources.java
index d875b59ce..d875b59ce 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyConfigurationResources.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyConfigurationResources.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/SystemCapabilityManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/SystemCapabilityManager.java
index 5020e4123..5020e4123 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/SystemCapabilityManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/SystemCapabilityManager.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/TTSChunkFactory.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/TTSChunkFactory.java
index b8b847261..b8b847261 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/TTSChunkFactory.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/TTSChunkFactory.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/Version.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/Version.java
index d49d979fe..d49d979fe 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/Version.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/Version.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/callbacks/InternalProxyMessage.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/callbacks/InternalProxyMessage.java
index dc03f5c72..dc03f5c72 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/callbacks/InternalProxyMessage.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/callbacks/InternalProxyMessage.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/callbacks/OnError.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/callbacks/OnError.java
index 0323afa15..0323afa15 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/callbacks/OnError.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/callbacks/OnError.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/callbacks/OnProxyClosed.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/callbacks/OnProxyClosed.java
index 9a32c4a8d..9a32c4a8d 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/callbacks/OnProxyClosed.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/callbacks/OnProxyClosed.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/callbacks/OnProxyOpened.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/callbacks/OnProxyOpened.java
index 1fa9c19eb..1fa9c19eb 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/callbacks/OnProxyOpened.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/callbacks/OnProxyOpened.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/callbacks/OnServiceEnded.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/callbacks/OnServiceEnded.java
index d69802e0f..d69802e0f 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/callbacks/OnServiceEnded.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/callbacks/OnServiceEnded.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/callbacks/OnServiceNACKed.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/callbacks/OnServiceNACKed.java
index 9eae5e4c4..9eae5e4c4 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/callbacks/OnServiceNACKed.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/callbacks/OnServiceNACKed.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/constants/Jingles.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/constants/Jingles.java
index b029e55e8..b029e55e8 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/constants/Jingles.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/constants/Jingles.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/constants/Names.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/constants/Names.java
index 26729e997..26729e997 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/constants/Names.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/constants/Names.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/IAudioStreamListener.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/IAudioStreamListener.java
index 8d21b7615..8d21b7615 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/IAudioStreamListener.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/IAudioStreamListener.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/IProxyListenerALM.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/IProxyListenerALM.java
index 2fb5a4063..2fb5a4063 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/IProxyListenerALM.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/IProxyListenerALM.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/IProxyListenerBase.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/IProxyListenerBase.java
index fc348faf5..fc348faf5 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/IProxyListenerBase.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/IProxyListenerBase.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/IPutFileResponseListener.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/IPutFileResponseListener.java
index 7929e86e6..7929e86e6 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/IPutFileResponseListener.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/IPutFileResponseListener.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/ISdl.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/ISdl.java
index 9b55d4f17..9b55d4f17 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/ISdl.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/ISdl.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/ISdlServiceListener.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/ISdlServiceListener.java
index db5179a73..db5179a73 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/ISdlServiceListener.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/ISdlServiceListener.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/IVideoStreamListener.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/IVideoStreamListener.java
index f645b0d55..f645b0d55 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/IVideoStreamListener.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/IVideoStreamListener.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/OnSystemCapabilityListener.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/OnSystemCapabilityListener.java
index d6fb11b4d..d6fb11b4d 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/OnSystemCapabilityListener.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/OnSystemCapabilityListener.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AddCommand.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AddCommand.java
index 9dec67b7d..9dec67b7d 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AddCommand.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AddCommand.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AddCommandResponse.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AddCommandResponse.java
index 27a19a53e..27a19a53e 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AddCommandResponse.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AddCommandResponse.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AddSubMenu.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AddSubMenu.java
index a272e5455..a272e5455 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AddSubMenu.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AddSubMenu.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AddSubMenuResponse.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AddSubMenuResponse.java
index dff7cd091..dff7cd091 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AddSubMenuResponse.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AddSubMenuResponse.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AirbagStatus.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AirbagStatus.java
index 06542c942..06542c942 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AirbagStatus.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AirbagStatus.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Alert.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Alert.java
index d0c4e0400..d0c4e0400 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Alert.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Alert.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AlertManeuver.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AlertManeuver.java
index 4fd218fa8..4fd218fa8 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AlertManeuver.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AlertManeuver.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AlertManeuverResponse.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AlertManeuverResponse.java
index f1a71bd66..f1a71bd66 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AlertManeuverResponse.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AlertManeuverResponse.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AlertResponse.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AlertResponse.java
index c95be6e37..c95be6e37 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AlertResponse.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AlertResponse.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AppServiceCapability.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AppServiceCapability.java
index 07be9f023..07be9f023 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AppServiceCapability.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AppServiceCapability.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AppServiceData.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AppServiceData.java
index ba0966580..ba0966580 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AppServiceData.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AppServiceData.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AppServiceManifest.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AppServiceManifest.java
index d5cee2365..d5cee2365 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AppServiceManifest.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AppServiceManifest.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AppServiceRecord.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AppServiceRecord.java
index 6d2d74d6d..6d2d74d6d 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AppServiceRecord.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AppServiceRecord.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AppServicesCapabilities.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AppServicesCapabilities.java
index ab09b1f5b..ab09b1f5b 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AppServicesCapabilities.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AppServicesCapabilities.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AudioControlCapabilities.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AudioControlCapabilities.java
index fcaa7bf4c..fcaa7bf4c 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AudioControlCapabilities.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AudioControlCapabilities.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AudioControlData.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AudioControlData.java
index b6ec0bfb1..b6ec0bfb1 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AudioControlData.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AudioControlData.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AudioPassThruCapabilities.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AudioPassThruCapabilities.java
index 675ddbbfc..675ddbbfc 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AudioPassThruCapabilities.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AudioPassThruCapabilities.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/BeltStatus.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/BeltStatus.java
index 65a7e674e..65a7e674e 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/BeltStatus.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/BeltStatus.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/BodyInformation.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/BodyInformation.java
index b2f4cd2f3..b2f4cd2f3 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/BodyInformation.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/BodyInformation.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ButtonCapabilities.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ButtonCapabilities.java
index b79685d12..b79685d12 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ButtonCapabilities.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ButtonCapabilities.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ButtonPress.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ButtonPress.java
index 94fb75083..94fb75083 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ButtonPress.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ButtonPress.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ButtonPressResponse.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ButtonPressResponse.java
index f2644160e..f2644160e 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ButtonPressResponse.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ButtonPressResponse.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ChangeRegistration.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ChangeRegistration.java
index f2981412f..f2981412f 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ChangeRegistration.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ChangeRegistration.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ChangeRegistrationResponse.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ChangeRegistrationResponse.java
index 4c1b0209b..4c1b0209b 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ChangeRegistrationResponse.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ChangeRegistrationResponse.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Choice.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Choice.java
index e93196bd5..e93196bd5 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Choice.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Choice.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ClimateControlCapabilities.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ClimateControlCapabilities.java
index 335fffa48..335fffa48 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ClimateControlCapabilities.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ClimateControlCapabilities.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ClimateControlData.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ClimateControlData.java
index 1229e4668..1229e4668 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ClimateControlData.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ClimateControlData.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/CloudAppProperties.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/CloudAppProperties.java
index 6538496ee..6538496ee 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/CloudAppProperties.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/CloudAppProperties.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ClusterModeStatus.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ClusterModeStatus.java
index 93ea9b604..93ea9b604 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ClusterModeStatus.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ClusterModeStatus.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Coordinate.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Coordinate.java
index f886ff52a..f886ff52a 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Coordinate.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Coordinate.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/CreateInteractionChoiceSet.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/CreateInteractionChoiceSet.java
index 07f17d1e6..07f17d1e6 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/CreateInteractionChoiceSet.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/CreateInteractionChoiceSet.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/CreateInteractionChoiceSetResponse.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/CreateInteractionChoiceSetResponse.java
index db368bb61..db368bb61 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/CreateInteractionChoiceSetResponse.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/CreateInteractionChoiceSetResponse.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DIDResult.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DIDResult.java
index b739e8789..b739e8789 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DIDResult.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DIDResult.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DTC.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DTC.java
index 57595672e..57595672e 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DTC.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DTC.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DateTime.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DateTime.java
index 1c3af0e88..1c3af0e88 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DateTime.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DateTime.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteCommand.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteCommand.java
index b08fa56c3..b08fa56c3 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteCommand.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteCommand.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteCommandResponse.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteCommandResponse.java
index c6b5c994c..c6b5c994c 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteCommandResponse.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteCommandResponse.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteFile.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteFile.java
index c9a0e76c7..c9a0e76c7 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteFile.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteFile.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteFileResponse.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteFileResponse.java
index 918ca7fce..918ca7fce 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteFileResponse.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteFileResponse.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteInteractionChoiceSet.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteInteractionChoiceSet.java
index 741675419..741675419 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteInteractionChoiceSet.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteInteractionChoiceSet.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteInteractionChoiceSetResponse.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteInteractionChoiceSetResponse.java
index d122975a0..d122975a0 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteInteractionChoiceSetResponse.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteInteractionChoiceSetResponse.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteSubMenu.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteSubMenu.java
index 97c4042e3..97c4042e3 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteSubMenu.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteSubMenu.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteSubMenuResponse.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteSubMenuResponse.java
index d13c850df..d13c850df 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteSubMenuResponse.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteSubMenuResponse.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeviceInfo.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeviceInfo.java
index 485d859b7..485d859b7 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeviceInfo.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeviceInfo.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeviceStatus.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeviceStatus.java
index 40382b81a..40382b81a 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeviceStatus.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeviceStatus.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DiagnosticMessage.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DiagnosticMessage.java
index 3d40ba31d..3d40ba31d 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DiagnosticMessage.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DiagnosticMessage.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DiagnosticMessageResponse.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DiagnosticMessageResponse.java
index 096acbd50..096acbd50 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DiagnosticMessageResponse.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DiagnosticMessageResponse.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DialNumber.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DialNumber.java
index 4707efc86..4707efc86 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DialNumber.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DialNumber.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DialNumberResponse.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DialNumberResponse.java
index ff2cef3be..ff2cef3be 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DialNumberResponse.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DialNumberResponse.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DisplayCapabilities.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DisplayCapabilities.java
index c8c761440..c8c761440 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DisplayCapabilities.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DisplayCapabilities.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ECallInfo.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ECallInfo.java
index 93a973aab..93a973aab 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ECallInfo.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ECallInfo.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/EmergencyEvent.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/EmergencyEvent.java
index ab2ed9377..ab2ed9377 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/EmergencyEvent.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/EmergencyEvent.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/EndAudioPassThru.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/EndAudioPassThru.java
index ab61c548e..ab61c548e 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/EndAudioPassThru.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/EndAudioPassThru.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/EndAudioPassThruResponse.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/EndAudioPassThruResponse.java
index fddb8a30c..fddb8a30c 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/EndAudioPassThruResponse.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/EndAudioPassThruResponse.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/EqualizerSettings.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/EqualizerSettings.java
index 78e76c808..78e76c808 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/EqualizerSettings.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/EqualizerSettings.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/FuelRange.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/FuelRange.java
index 01027aa8d..01027aa8d 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/FuelRange.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/FuelRange.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GPSData.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GPSData.java
index ca264556f..ca264556f 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GPSData.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GPSData.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GenericResponse.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GenericResponse.java
index a92c237e3..a92c237e3 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GenericResponse.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GenericResponse.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetAppServiceData.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetAppServiceData.java
index bfc0e43be..bfc0e43be 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetAppServiceData.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetAppServiceData.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetAppServiceDataResponse.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetAppServiceDataResponse.java
index db2dea526..db2dea526 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetAppServiceDataResponse.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetAppServiceDataResponse.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetCloudAppProperties.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetCloudAppProperties.java
index 032ae7dad..032ae7dad 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetCloudAppProperties.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetCloudAppProperties.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetCloudAppPropertiesResponse.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetCloudAppPropertiesResponse.java
index 7577dd396..7577dd396 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetCloudAppPropertiesResponse.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetCloudAppPropertiesResponse.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetDTCs.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetDTCs.java
index 23eeac0d4..23eeac0d4 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetDTCs.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetDTCs.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetDTCsResponse.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetDTCsResponse.java
index 802f6b34a..802f6b34a 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetDTCsResponse.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetDTCsResponse.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetFile.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetFile.java
index 51913be77..51913be77 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetFile.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetFile.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetFileResponse.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetFileResponse.java
index 10d8bb72e..10d8bb72e 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetFileResponse.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetFileResponse.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetInteriorVehicleData.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetInteriorVehicleData.java
index dc6ab5444..dc6ab5444 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetInteriorVehicleData.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetInteriorVehicleData.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetInteriorVehicleDataResponse.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetInteriorVehicleDataResponse.java
index 88d663805..88d663805 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetInteriorVehicleDataResponse.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetInteriorVehicleDataResponse.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetSystemCapability.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetSystemCapability.java
index 9d8529d6d..9d8529d6d 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetSystemCapability.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetSystemCapability.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetSystemCapabilityResponse.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetSystemCapabilityResponse.java
index afcc8c48c..afcc8c48c 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetSystemCapabilityResponse.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetSystemCapabilityResponse.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleData.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleData.java
index b847b37bc..b847b37bc 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleData.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleData.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleDataResponse.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleDataResponse.java
index fc26a2c9a..fc26a2c9a 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleDataResponse.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleDataResponse.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetWayPoints.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetWayPoints.java
index 95b076e52..95b076e52 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetWayPoints.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetWayPoints.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetWayPointsResponse.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetWayPointsResponse.java
index 32344ffbd..32344ffbd 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetWayPointsResponse.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetWayPointsResponse.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HMICapabilities.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HMICapabilities.java
index 8f4cdfe66..8f4cdfe66 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HMICapabilities.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HMICapabilities.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HMIPermissions.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HMIPermissions.java
index 307ff8b06..307ff8b06 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HMIPermissions.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HMIPermissions.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HMISettingsControlCapabilities.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HMISettingsControlCapabilities.java
index f5377b1b0..f5377b1b0 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HMISettingsControlCapabilities.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HMISettingsControlCapabilities.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HMISettingsControlData.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HMISettingsControlData.java
index e6dc4d301..e6dc4d301 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HMISettingsControlData.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HMISettingsControlData.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HapticRect.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HapticRect.java
index a102f3eb1..a102f3eb1 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HapticRect.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HapticRect.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HeadLampStatus.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HeadLampStatus.java
index 68ffc88ad..68ffc88ad 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HeadLampStatus.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HeadLampStatus.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Headers.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Headers.java
index 2ae607100..2ae607100 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Headers.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Headers.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Image.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Image.java
index f58664054..f58664054 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Image.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Image.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ImageField.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ImageField.java
index 6114f28c0..6114f28c0 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ImageField.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ImageField.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ImageResolution.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ImageResolution.java
index 2eb69f652..2eb69f652 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ImageResolution.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ImageResolution.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/KeyboardProperties.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/KeyboardProperties.java
index d74914cb3..d74914cb3 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/KeyboardProperties.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/KeyboardProperties.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/LightCapabilities.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/LightCapabilities.java
index b23c8356c..b23c8356c 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/LightCapabilities.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/LightCapabilities.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/LightControlCapabilities.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/LightControlCapabilities.java
index ab84da275..ab84da275 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/LightControlCapabilities.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/LightControlCapabilities.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/LightControlData.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/LightControlData.java
index a78b979c5..a78b979c5 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/LightControlData.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/LightControlData.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/LightState.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/LightState.java
index 90315f785..90315f785 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/LightState.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/LightState.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ListFiles.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ListFiles.java
index faeaa7977..faeaa7977 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ListFiles.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ListFiles.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ListFilesResponse.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ListFilesResponse.java
index b525bc599..b525bc599 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ListFilesResponse.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ListFilesResponse.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/LocationDetails.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/LocationDetails.java
index 51d150a2b..51d150a2b 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/LocationDetails.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/LocationDetails.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MassageCushionFirmness.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MassageCushionFirmness.java
index 8e87eff7d..8e87eff7d 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MassageCushionFirmness.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MassageCushionFirmness.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MassageModeData.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MassageModeData.java
index 857d4dc7c..857d4dc7c 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MassageModeData.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MassageModeData.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MediaServiceData.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MediaServiceData.java
index bf4b960eb..bf4b960eb 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MediaServiceData.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MediaServiceData.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MediaServiceManifest.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MediaServiceManifest.java
index 22d66e7e7..22d66e7e7 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MediaServiceManifest.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MediaServiceManifest.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MenuParams.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MenuParams.java
index 841cf6b90..841cf6b90 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MenuParams.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MenuParams.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MetadataTags.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MetadataTags.java
index dc5a9b5aa..dc5a9b5aa 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MetadataTags.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MetadataTags.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ModuleData.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ModuleData.java
index 85a24c064..85a24c064 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ModuleData.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ModuleData.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MyKey.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MyKey.java
index 3393f527a..3393f527a 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MyKey.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MyKey.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/NavigationCapability.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/NavigationCapability.java
index c3d0d59f8..c3d0d59f8 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/NavigationCapability.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/NavigationCapability.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/NavigationInstruction.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/NavigationInstruction.java
index 5052e55f9..5052e55f9 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/NavigationInstruction.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/NavigationInstruction.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/NavigationServiceData.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/NavigationServiceData.java
index 4c1817954..4c1817954 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/NavigationServiceData.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/NavigationServiceData.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/NavigationServiceManifest.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/NavigationServiceManifest.java
index 54da7bdd1..54da7bdd1 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/NavigationServiceManifest.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/NavigationServiceManifest.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OasisAddress.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OasisAddress.java
index 54b95e300..54b95e300 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OasisAddress.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OasisAddress.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnAppInterfaceUnregistered.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnAppInterfaceUnregistered.java
index adc3296c1..adc3296c1 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnAppInterfaceUnregistered.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnAppInterfaceUnregistered.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnAppServiceData.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnAppServiceData.java
index 48cab3cd6..48cab3cd6 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnAppServiceData.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnAppServiceData.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnAudioPassThru.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnAudioPassThru.java
index 40186c63d..40186c63d 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnAudioPassThru.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnAudioPassThru.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnButtonEvent.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnButtonEvent.java
index 28bf0b3ce..28bf0b3ce 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnButtonEvent.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnButtonEvent.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnButtonPress.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnButtonPress.java
index f96548ec2..f96548ec2 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnButtonPress.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnButtonPress.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnCommand.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnCommand.java
index 0a7f1e89d..0a7f1e89d 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnCommand.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnCommand.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnDriverDistraction.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnDriverDistraction.java
index 8bd45e528..8bd45e528 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnDriverDistraction.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnDriverDistraction.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnHMIStatus.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnHMIStatus.java
index 6c79eeb5d..6c79eeb5d 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnHMIStatus.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnHMIStatus.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnHashChange.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnHashChange.java
index 2a4581f06..2a4581f06 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnHashChange.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnHashChange.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnInteriorVehicleData.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnInteriorVehicleData.java
index a91a720c4..a91a720c4 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnInteriorVehicleData.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnInteriorVehicleData.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnKeyboardInput.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnKeyboardInput.java
index 5bf3b8893..5bf3b8893 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnKeyboardInput.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnKeyboardInput.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnLanguageChange.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnLanguageChange.java
index 5464eb359..5464eb359 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnLanguageChange.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnLanguageChange.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnLockScreenStatus.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnLockScreenStatus.java
index 21a5c3520..21a5c3520 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnLockScreenStatus.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnLockScreenStatus.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnPermissionsChange.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnPermissionsChange.java
index efe1c184b..efe1c184b 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnPermissionsChange.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnPermissionsChange.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnRCStatus.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnRCStatus.java
index 8be1e0007..8be1e0007 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnRCStatus.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnRCStatus.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnSdlChoiceChosen.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnSdlChoiceChosen.java
index 5eec2db91..5eec2db91 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnSdlChoiceChosen.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnSdlChoiceChosen.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnStreamRPC.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnStreamRPC.java
index 679596026..679596026 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnStreamRPC.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnStreamRPC.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnSystemCapabilityUpdated.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnSystemCapabilityUpdated.java
index 37d34b420..37d34b420 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnSystemCapabilityUpdated.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnSystemCapabilityUpdated.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnSystemRequest.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnSystemRequest.java
index 9654d8c2a..9654d8c2a 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnSystemRequest.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnSystemRequest.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnTBTClientState.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnTBTClientState.java
index fad694373..fad694373 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnTBTClientState.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnTBTClientState.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnTouchEvent.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnTouchEvent.java
index 7504c9197..7504c9197 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnTouchEvent.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnTouchEvent.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnVehicleData.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnVehicleData.java
index 7b97f9286..7b97f9286 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnVehicleData.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnVehicleData.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnWayPointChange.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnWayPointChange.java
index cb9130e1a..cb9130e1a 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnWayPointChange.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnWayPointChange.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ParameterPermissions.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ParameterPermissions.java
index 5fbb00b74..5fbb00b74 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ParameterPermissions.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ParameterPermissions.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformAppServiceInteraction.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformAppServiceInteraction.java
index 37dd36684..37dd36684 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformAppServiceInteraction.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformAppServiceInteraction.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformAppServiceInteractionResponse.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformAppServiceInteractionResponse.java
index 718c6526b..718c6526b 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformAppServiceInteractionResponse.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformAppServiceInteractionResponse.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformAudioPassThru.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformAudioPassThru.java
index bbd0c32e3..bbd0c32e3 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformAudioPassThru.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformAudioPassThru.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformAudioPassThruResponse.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformAudioPassThruResponse.java
index f68a412f0..f68a412f0 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformAudioPassThruResponse.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformAudioPassThruResponse.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformInteraction.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformInteraction.java
index 9067edb98..9067edb98 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformInteraction.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformInteraction.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformInteractionResponse.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformInteractionResponse.java
index 5bd4afe8c..5bd4afe8c 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformInteractionResponse.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformInteractionResponse.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PermissionItem.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PermissionItem.java
index 24695a872..24695a872 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PermissionItem.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PermissionItem.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PhoneCapability.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PhoneCapability.java
index c317e0eb9..c317e0eb9 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PhoneCapability.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PhoneCapability.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PresetBankCapabilities.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PresetBankCapabilities.java
index 79d7c9546..79d7c9546 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PresetBankCapabilities.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PresetBankCapabilities.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PublishAppService.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PublishAppService.java
index ae11f06c6..ae11f06c6 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PublishAppService.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PublishAppService.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PublishAppServiceResponse.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PublishAppServiceResponse.java
index 753ad30a0..753ad30a0 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PublishAppServiceResponse.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PublishAppServiceResponse.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PutFile.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PutFile.java
index 2d9010600..2d9010600 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PutFile.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PutFile.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PutFileResponse.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PutFileResponse.java
index f8d4a3bca..f8d4a3bca 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PutFileResponse.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PutFileResponse.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RGBColor.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RGBColor.java
index 81d43161d..81d43161d 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RGBColor.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RGBColor.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RadioControlCapabilities.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RadioControlCapabilities.java
index ac46368d8..ac46368d8 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RadioControlCapabilities.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RadioControlCapabilities.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RadioControlData.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RadioControlData.java
index fcedfdb0f..fcedfdb0f 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RadioControlData.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RadioControlData.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RdsData.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RdsData.java
index 2ed934865..2ed934865 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RdsData.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RdsData.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ReadDID.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ReadDID.java
index 7d62cf019..7d62cf019 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ReadDID.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ReadDID.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ReadDIDResponse.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ReadDIDResponse.java
index 3cf835906..3cf835906 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ReadDIDResponse.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ReadDIDResponse.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Rectangle.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Rectangle.java
index d2545b5e5..d2545b5e5 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Rectangle.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Rectangle.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RegisterAppInterface.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RegisterAppInterface.java
index 5ba1e623d..5ba1e623d 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RegisterAppInterface.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RegisterAppInterface.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RegisterAppInterfaceResponse.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RegisterAppInterfaceResponse.java
index 746129a85..746129a85 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RegisterAppInterfaceResponse.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RegisterAppInterfaceResponse.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RemoteControlCapabilities.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RemoteControlCapabilities.java
index 4c9861101..4c9861101 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RemoteControlCapabilities.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RemoteControlCapabilities.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ResetGlobalProperties.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ResetGlobalProperties.java
index 2adb03ec1..2adb03ec1 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ResetGlobalProperties.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ResetGlobalProperties.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ResetGlobalPropertiesResponse.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ResetGlobalPropertiesResponse.java
index 78f245ea8..78f245ea8 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ResetGlobalPropertiesResponse.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ResetGlobalPropertiesResponse.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ScreenParams.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ScreenParams.java
index e9a3168e7..e9a3168e7 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ScreenParams.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ScreenParams.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ScrollableMessage.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ScrollableMessage.java
index 2ee1230f7..2ee1230f7 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ScrollableMessage.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ScrollableMessage.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ScrollableMessageResponse.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ScrollableMessageResponse.java
index 2113e3095..2113e3095 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ScrollableMessageResponse.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ScrollableMessageResponse.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SdlMsgVersion.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SdlMsgVersion.java
index 3e1637e22..3e1637e22 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SdlMsgVersion.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SdlMsgVersion.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SeatControlCapabilities.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SeatControlCapabilities.java
index e1d488cb5..e1d488cb5 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SeatControlCapabilities.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SeatControlCapabilities.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SeatControlData.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SeatControlData.java
index 26d52d713..26d52d713 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SeatControlData.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SeatControlData.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SeatMemoryAction.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SeatMemoryAction.java
index a8673a9eb..a8673a9eb 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SeatMemoryAction.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SeatMemoryAction.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SendHapticData.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SendHapticData.java
index a93fd2b98..a93fd2b98 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SendHapticData.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SendHapticData.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SendHapticDataResponse.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SendHapticDataResponse.java
index 58761a4a5..58761a4a5 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SendHapticDataResponse.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SendHapticDataResponse.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SendLocation.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SendLocation.java
index c25f57648..c25f57648 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SendLocation.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SendLocation.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SendLocationResponse.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SendLocationResponse.java
index dc1193a8b..dc1193a8b 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SendLocationResponse.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SendLocationResponse.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetAppIcon.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetAppIcon.java
index 02ee081c2..02ee081c2 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetAppIcon.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetAppIcon.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetAppIconResponse.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetAppIconResponse.java
index 45e6ff180..45e6ff180 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetAppIconResponse.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetAppIconResponse.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetCloudAppProperties.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetCloudAppProperties.java
index 5f6160361..5f6160361 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetCloudAppProperties.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetCloudAppProperties.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetCloudAppPropertiesResponse.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetCloudAppPropertiesResponse.java
index ea3e79d00..ea3e79d00 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetCloudAppPropertiesResponse.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetCloudAppPropertiesResponse.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetDisplayLayout.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetDisplayLayout.java
index 2bff6d1ec..2bff6d1ec 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetDisplayLayout.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetDisplayLayout.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetDisplayLayoutResponse.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetDisplayLayoutResponse.java
index 48b98bd24..48b98bd24 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetDisplayLayoutResponse.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetDisplayLayoutResponse.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetGlobalProperties.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetGlobalProperties.java
index edd943494..edd943494 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetGlobalProperties.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetGlobalProperties.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetGlobalPropertiesResponse.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetGlobalPropertiesResponse.java
index 89b5219a5..89b5219a5 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetGlobalPropertiesResponse.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetGlobalPropertiesResponse.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetInteriorVehicleData.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetInteriorVehicleData.java
index ad5a0d26a..ad5a0d26a 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetInteriorVehicleData.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetInteriorVehicleData.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetInteriorVehicleDataResponse.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetInteriorVehicleDataResponse.java
index 837b36fc7..837b36fc7 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetInteriorVehicleDataResponse.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetInteriorVehicleDataResponse.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetMediaClockTimer.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetMediaClockTimer.java
index 9063430a5..9063430a5 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetMediaClockTimer.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetMediaClockTimer.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetMediaClockTimerResponse.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetMediaClockTimerResponse.java
index 56a63c947..56a63c947 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetMediaClockTimerResponse.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetMediaClockTimerResponse.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Show.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Show.java
index 6a42fe1a8..6a42fe1a8 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Show.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Show.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ShowConstantTbt.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ShowConstantTbt.java
index 6a44b9068..6a44b9068 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ShowConstantTbt.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ShowConstantTbt.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ShowConstantTbtResponse.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ShowConstantTbtResponse.java
index 5482a00ae..5482a00ae 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ShowConstantTbtResponse.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ShowConstantTbtResponse.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ShowResponse.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ShowResponse.java
index 1187f6687..1187f6687 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ShowResponse.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ShowResponse.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SingleTireStatus.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SingleTireStatus.java
index e3a63c276..e3a63c276 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SingleTireStatus.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SingleTireStatus.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SisData.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SisData.java
index 13b30e37d..13b30e37d 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SisData.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SisData.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Slider.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Slider.java
index df92e22fe..df92e22fe 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Slider.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Slider.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SliderResponse.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SliderResponse.java
index b7f4a08a6..b7f4a08a6 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SliderResponse.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SliderResponse.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SoftButton.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SoftButton.java
index cd4517dcd..cd4517dcd 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SoftButton.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SoftButton.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SoftButtonCapabilities.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SoftButtonCapabilities.java
index 9299e1b2b..9299e1b2b 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SoftButtonCapabilities.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SoftButtonCapabilities.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Speak.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Speak.java
index 8a0b3a380..8a0b3a380 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Speak.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Speak.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SpeakResponse.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SpeakResponse.java
index 5f78b609b..5f78b609b 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SpeakResponse.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SpeakResponse.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/StartTime.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/StartTime.java
index 97efa8c05..97efa8c05 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/StartTime.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/StartTime.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/StationIDNumber.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/StationIDNumber.java
index a8e926a2b..a8e926a2b 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/StationIDNumber.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/StationIDNumber.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/StreamRPCResponse.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/StreamRPCResponse.java
index d1de24993..d1de24993 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/StreamRPCResponse.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/StreamRPCResponse.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeButton.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeButton.java
index 80e988e35..80e988e35 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeButton.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeButton.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeButtonResponse.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeButtonResponse.java
index fbed88bbc..fbed88bbc 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeButtonResponse.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeButtonResponse.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleData.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleData.java
index 700f1dcb9..700f1dcb9 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleData.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleData.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleDataResponse.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleDataResponse.java
index cc27233a8..cc27233a8 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleDataResponse.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleDataResponse.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeWayPoints.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeWayPoints.java
index e0d3627e2..e0d3627e2 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeWayPoints.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeWayPoints.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeWayPointsResponse.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeWayPointsResponse.java
index 8ca946c5c..8ca946c5c 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeWayPointsResponse.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeWayPointsResponse.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SystemCapability.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SystemCapability.java
index 4450a83d4..4450a83d4 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SystemCapability.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SystemCapability.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SystemRequest.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SystemRequest.java
index ee7dad05b..ee7dad05b 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SystemRequest.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SystemRequest.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SystemRequestResponse.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SystemRequestResponse.java
index fab8b09ba..fab8b09ba 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SystemRequestResponse.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SystemRequestResponse.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TTSChunk.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TTSChunk.java
index a1e26d6b2..a1e26d6b2 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TTSChunk.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TTSChunk.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Temperature.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Temperature.java
index 87513a3cd..87513a3cd 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Temperature.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Temperature.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TemplateColorScheme.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TemplateColorScheme.java
index db915a4eb..db915a4eb 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TemplateColorScheme.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TemplateColorScheme.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TextField.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TextField.java
index 23e5c148f..23e5c148f 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TextField.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TextField.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TireStatus.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TireStatus.java
index 15028cc9e..15028cc9e 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TireStatus.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TireStatus.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TouchCoord.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TouchCoord.java
index b14dcfaec..b14dcfaec 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TouchCoord.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TouchCoord.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TouchEvent.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TouchEvent.java
index 0abb75062..0abb75062 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TouchEvent.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TouchEvent.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TouchEventCapabilities.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TouchEventCapabilities.java
index c8c441158..c8c441158 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TouchEventCapabilities.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TouchEventCapabilities.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Turn.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Turn.java
index 323974019..323974019 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Turn.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Turn.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnregisterAppInterface.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnregisterAppInterface.java
index b832d81c4..b832d81c4 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnregisterAppInterface.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnregisterAppInterface.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnregisterAppInterfaceResponse.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnregisterAppInterfaceResponse.java
index 4660dc24e..4660dc24e 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnregisterAppInterfaceResponse.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnregisterAppInterfaceResponse.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeButton.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeButton.java
index 53a4e9162..53a4e9162 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeButton.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeButton.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeButtonResponse.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeButtonResponse.java
index 5d6bd8579..5d6bd8579 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeButtonResponse.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeButtonResponse.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleData.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleData.java
index e682fa518..e682fa518 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleData.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleData.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleDataResponse.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleDataResponse.java
index c2ba69cfa..c2ba69cfa 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleDataResponse.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleDataResponse.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeWayPoints.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeWayPoints.java
index b748ef673..b748ef673 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeWayPoints.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeWayPoints.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeWayPointsResponse.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeWayPointsResponse.java
index b7feef73e..b7feef73e 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeWayPointsResponse.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeWayPointsResponse.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UpdateTurnList.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UpdateTurnList.java
index cb1dde7e4..cb1dde7e4 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UpdateTurnList.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UpdateTurnList.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UpdateTurnListResponse.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UpdateTurnListResponse.java
index 5b0fbabf7..5b0fbabf7 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UpdateTurnListResponse.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UpdateTurnListResponse.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VehicleDataResult.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VehicleDataResult.java
index 10860deab..10860deab 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VehicleDataResult.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VehicleDataResult.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VehicleType.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VehicleType.java
index e6f860007..e6f860007 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VehicleType.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VehicleType.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VideoStreamingCapability.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VideoStreamingCapability.java
index c558673e5..c558673e5 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VideoStreamingCapability.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VideoStreamingCapability.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VideoStreamingFormat.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VideoStreamingFormat.java
index 0ddfec2ef..0ddfec2ef 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VideoStreamingFormat.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VideoStreamingFormat.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VrHelpItem.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VrHelpItem.java
index 39fb08b8b..39fb08b8b 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VrHelpItem.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VrHelpItem.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/WeatherAlert.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/WeatherAlert.java
index 3131b0998..3131b0998 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/WeatherAlert.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/WeatherAlert.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/WeatherData.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/WeatherData.java
index a71261902..a71261902 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/WeatherData.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/WeatherData.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/WeatherServiceData.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/WeatherServiceData.java
index 07a0b99a8..07a0b99a8 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/WeatherServiceData.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/WeatherServiceData.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/WeatherServiceManifest.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/WeatherServiceManifest.java
index 874b37e69..874b37e69 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/WeatherServiceManifest.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/WeatherServiceManifest.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AmbientLightStatus.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AmbientLightStatus.java
index 3f4076b11..3f4076b11 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AmbientLightStatus.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AmbientLightStatus.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AppHMIType.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AppHMIType.java
index 1bb045006..1bb045006 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AppHMIType.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AppHMIType.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AppInterfaceUnregisteredReason.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AppInterfaceUnregisteredReason.java
index d4a7ff103..d4a7ff103 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AppInterfaceUnregisteredReason.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AppInterfaceUnregisteredReason.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AppServiceType.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AppServiceType.java
index a4b8e16c2..a4b8e16c2 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AppServiceType.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AppServiceType.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AudioStreamingIndicator.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AudioStreamingIndicator.java
index 00a15d9f0..00a15d9f0 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AudioStreamingIndicator.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AudioStreamingIndicator.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AudioStreamingState.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AudioStreamingState.java
index 50accb6bf..50accb6bf 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AudioStreamingState.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AudioStreamingState.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AudioType.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AudioType.java
index d340e0e4c..d340e0e4c 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AudioType.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AudioType.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/BitsPerSample.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/BitsPerSample.java
index b21e138a9..b21e138a9 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/BitsPerSample.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/BitsPerSample.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ButtonEventMode.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ButtonEventMode.java
index 33f1f0f49..33f1f0f49 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ButtonEventMode.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ButtonEventMode.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ButtonName.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ButtonName.java
index 6d4cecffc..6d4cecffc 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ButtonName.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ButtonName.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ButtonPressMode.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ButtonPressMode.java
index cc2852526..cc2852526 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ButtonPressMode.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ButtonPressMode.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/CarModeStatus.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/CarModeStatus.java
index c44b457ec..c44b457ec 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/CarModeStatus.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/CarModeStatus.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/CharacterSet.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/CharacterSet.java
index b8c4c9535..b8c4c9535 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/CharacterSet.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/CharacterSet.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/CompassDirection.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/CompassDirection.java
index a450bf6ed..a450bf6ed 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/CompassDirection.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/CompassDirection.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ComponentVolumeStatus.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ComponentVolumeStatus.java
index 64d5515ad..64d5515ad 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ComponentVolumeStatus.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ComponentVolumeStatus.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/DefrostZone.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/DefrostZone.java
index 4c6b15e85..4c6b15e85 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/DefrostZone.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/DefrostZone.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/DeliveryMode.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/DeliveryMode.java
index 52361a97d..52361a97d 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/DeliveryMode.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/DeliveryMode.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/DeviceLevelStatus.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/DeviceLevelStatus.java
index 273dc83d3..273dc83d3 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/DeviceLevelStatus.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/DeviceLevelStatus.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/Dimension.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/Dimension.java
index 012803510..012803510 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/Dimension.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/Dimension.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/Direction.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/Direction.java
index 546d1316c..546d1316c 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/Direction.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/Direction.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/DisplayMode.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/DisplayMode.java
index 5a0c0c7e4..5a0c0c7e4 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/DisplayMode.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/DisplayMode.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/DisplayType.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/DisplayType.java
index 2a2996762..2a2996762 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/DisplayType.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/DisplayType.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/DistanceUnit.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/DistanceUnit.java
index 36e103bf3..36e103bf3 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/DistanceUnit.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/DistanceUnit.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/DriverDistractionState.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/DriverDistractionState.java
index 890488c5e..890488c5e 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/DriverDistractionState.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/DriverDistractionState.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ECallConfirmationStatus.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ECallConfirmationStatus.java
index b7a341d9e..b7a341d9e 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ECallConfirmationStatus.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ECallConfirmationStatus.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ElectronicParkBrakeStatus.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ElectronicParkBrakeStatus.java
index f3951c7a1..f3951c7a1 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ElectronicParkBrakeStatus.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ElectronicParkBrakeStatus.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/EmergencyEventType.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/EmergencyEventType.java
index 374a6c7e2..374a6c7e2 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/EmergencyEventType.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/EmergencyEventType.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/FileType.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/FileType.java
index 54e5ce8b8..54e5ce8b8 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/FileType.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/FileType.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/FuelCutoffStatus.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/FuelCutoffStatus.java
index 266f13afb..266f13afb 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/FuelCutoffStatus.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/FuelCutoffStatus.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/FuelType.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/FuelType.java
index 8241ebd45..8241ebd45 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/FuelType.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/FuelType.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/GlobalProperty.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/GlobalProperty.java
index a54d53d1d..a54d53d1d 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/GlobalProperty.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/GlobalProperty.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/HMILevel.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/HMILevel.java
index 8757a26ec..8757a26ec 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/HMILevel.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/HMILevel.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/HmiZoneCapabilities.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/HmiZoneCapabilities.java
index 4725b4ff4..4725b4ff4 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/HmiZoneCapabilities.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/HmiZoneCapabilities.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/HybridAppPreference.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/HybridAppPreference.java
index 16732e9c3..16732e9c3 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/HybridAppPreference.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/HybridAppPreference.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/IgnitionStableStatus.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/IgnitionStableStatus.java
index 91d6ecf8e..91d6ecf8e 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/IgnitionStableStatus.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/IgnitionStableStatus.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/IgnitionStatus.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/IgnitionStatus.java
index b17ccf1cf..b17ccf1cf 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/IgnitionStatus.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/IgnitionStatus.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ImageFieldName.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ImageFieldName.java
index 799b1e99d..799b1e99d 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ImageFieldName.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ImageFieldName.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ImageType.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ImageType.java
index 5b79257e1..5b79257e1 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ImageType.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ImageType.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/InteractionMode.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/InteractionMode.java
index 98b61a1f2..98b61a1f2 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/InteractionMode.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/InteractionMode.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/Jingle.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/Jingle.java
index 85a1e8e67..85a1e8e67 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/Jingle.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/Jingle.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/KeyboardEvent.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/KeyboardEvent.java
index 7a730377d..7a730377d 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/KeyboardEvent.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/KeyboardEvent.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/KeyboardLayout.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/KeyboardLayout.java
index 2cd71b3f3..2cd71b3f3 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/KeyboardLayout.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/KeyboardLayout.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/KeypressMode.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/KeypressMode.java
index 32e198585..32e198585 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/KeypressMode.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/KeypressMode.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/Language.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/Language.java
index 4ac4f6264..4ac4f6264 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/Language.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/Language.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/LayoutMode.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/LayoutMode.java
index b64cf1bb3..b64cf1bb3 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/LayoutMode.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/LayoutMode.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/LightName.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/LightName.java
index c3812f2da..c3812f2da 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/LightName.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/LightName.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/LightStatus.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/LightStatus.java
index 98c4b175c..98c4b175c 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/LightStatus.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/LightStatus.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/LockScreenStatus.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/LockScreenStatus.java
index ba25a3024..ba25a3024 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/LockScreenStatus.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/LockScreenStatus.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/MassageCushion.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/MassageCushion.java
index ed23b4899..ed23b4899 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/MassageCushion.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/MassageCushion.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/MassageMode.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/MassageMode.java
index 59a200bdb..59a200bdb 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/MassageMode.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/MassageMode.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/MassageZone.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/MassageZone.java
index 9f0e23ffe..9f0e23ffe 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/MassageZone.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/MassageZone.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/MediaClockFormat.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/MediaClockFormat.java
index 2bf84744a..2bf84744a 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/MediaClockFormat.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/MediaClockFormat.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/MediaType.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/MediaType.java
index f28face34..f28face34 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/MediaType.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/MediaType.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/MetadataType.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/MetadataType.java
index 9f51a6437..9f51a6437 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/MetadataType.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/MetadataType.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ModuleType.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ModuleType.java
index c4bedfd46..c4bedfd46 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ModuleType.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ModuleType.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/NavigationAction.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/NavigationAction.java
index 2619b5505..2619b5505 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/NavigationAction.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/NavigationAction.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/NavigationJunction.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/NavigationJunction.java
index 693582a13..693582a13 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/NavigationJunction.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/NavigationJunction.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/PRNDL.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/PRNDL.java
index 965ebb8b4..965ebb8b4 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/PRNDL.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/PRNDL.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/PowerModeQualificationStatus.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/PowerModeQualificationStatus.java
index c268e14aa..c268e14aa 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/PowerModeQualificationStatus.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/PowerModeQualificationStatus.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/PowerModeStatus.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/PowerModeStatus.java
index 06ed3ba9a..06ed3ba9a 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/PowerModeStatus.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/PowerModeStatus.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/PredefinedLayout.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/PredefinedLayout.java
index 458320d1e..458320d1e 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/PredefinedLayout.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/PredefinedLayout.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/PrerecordedSpeech.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/PrerecordedSpeech.java
index 2b27040a6..2b27040a6 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/PrerecordedSpeech.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/PrerecordedSpeech.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/PrimaryAudioSource.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/PrimaryAudioSource.java
index 27f83d7d4..27f83d7d4 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/PrimaryAudioSource.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/PrimaryAudioSource.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/RadioBand.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/RadioBand.java
index 2b2c862d8..2b2c862d8 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/RadioBand.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/RadioBand.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/RadioState.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/RadioState.java
index 533c86dca..533c86dca 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/RadioState.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/RadioState.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/RequestType.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/RequestType.java
index e6fbab6df..e6fbab6df 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/RequestType.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/RequestType.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/Result.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/Result.java
index 25b9a16f5..25b9a16f5 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/Result.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/Result.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SamplingRate.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SamplingRate.java
index e659ff165..e659ff165 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SamplingRate.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SamplingRate.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SdlConnectionState.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SdlConnectionState.java
index fa2caecb6..fa2caecb6 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SdlConnectionState.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SdlConnectionState.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SdlDisconnectedReason.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SdlDisconnectedReason.java
index 6c83fc1d9..6c83fc1d9 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SdlDisconnectedReason.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SdlDisconnectedReason.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SdlInterfaceAvailability.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SdlInterfaceAvailability.java
index 0f6b2530c..0f6b2530c 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SdlInterfaceAvailability.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SdlInterfaceAvailability.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SeatMemoryActionType.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SeatMemoryActionType.java
index e81b2694a..e81b2694a 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SeatMemoryActionType.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SeatMemoryActionType.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ServiceUpdateReason.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ServiceUpdateReason.java
index 302feff3f..302feff3f 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ServiceUpdateReason.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ServiceUpdateReason.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SoftButtonType.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SoftButtonType.java
index 29fa27020..29fa27020 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SoftButtonType.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SoftButtonType.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SpeechCapabilities.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SpeechCapabilities.java
index 7d8330d0a..7d8330d0a 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SpeechCapabilities.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SpeechCapabilities.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/StaticIconName.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/StaticIconName.java
index 455995ff3..455995ff3 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/StaticIconName.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/StaticIconName.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SupportedSeat.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SupportedSeat.java
index c68f2e79d..c68f2e79d 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SupportedSeat.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SupportedSeat.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SystemAction.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SystemAction.java
index 835e9b1b9..835e9b1b9 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SystemAction.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SystemAction.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SystemCapabilityType.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SystemCapabilityType.java
index c9f612bec..c9f612bec 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SystemCapabilityType.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SystemCapabilityType.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SystemContext.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SystemContext.java
index 1ea9d60b1..1ea9d60b1 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SystemContext.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SystemContext.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TBTState.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TBTState.java
index d334ccad7..d334ccad7 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TBTState.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TBTState.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TPMS.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TPMS.java
index 69b60e211..69b60e211 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TPMS.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TPMS.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TemperatureUnit.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TemperatureUnit.java
index 6c9b04875..6c9b04875 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TemperatureUnit.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TemperatureUnit.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TextAlignment.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TextAlignment.java
index b188d6ba8..b188d6ba8 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TextAlignment.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TextAlignment.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TextFieldName.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TextFieldName.java
index ded9d0571..ded9d0571 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TextFieldName.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TextFieldName.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TouchType.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TouchType.java
index 7cc259aa4..7cc259aa4 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TouchType.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TouchType.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TriggerSource.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TriggerSource.java
index 169721705..169721705 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TriggerSource.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TriggerSource.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TurnSignal.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TurnSignal.java
index 923cd842e..923cd842e 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TurnSignal.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TurnSignal.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/UpdateMode.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/UpdateMode.java
index cd9bf6dfe..cd9bf6dfe 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/UpdateMode.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/UpdateMode.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataEventStatus.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataEventStatus.java
index 64a5dd898..64a5dd898 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataEventStatus.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataEventStatus.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataNotificationStatus.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataNotificationStatus.java
index d7bca9fc7..d7bca9fc7 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataNotificationStatus.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataNotificationStatus.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataResultCode.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataResultCode.java
index 45c2e7c11..45c2e7c11 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataResultCode.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataResultCode.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataStatus.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataStatus.java
index 2245bbe71..2245bbe71 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataStatus.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataStatus.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataType.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataType.java
index 8694d67c1..8694d67c1 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataType.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataType.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VentilationMode.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VentilationMode.java
index b7a2ae9a2..b7a2ae9a2 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VentilationMode.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VentilationMode.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VideoStreamingCodec.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VideoStreamingCodec.java
index a41c1d064..a41c1d064 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VideoStreamingCodec.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VideoStreamingCodec.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VideoStreamingProtocol.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VideoStreamingProtocol.java
index 412badcac..412badcac 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VideoStreamingProtocol.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VideoStreamingProtocol.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VideoStreamingState.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VideoStreamingState.java
index 80384016b..80384016b 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VideoStreamingState.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VideoStreamingState.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VrCapabilities.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VrCapabilities.java
index e228638ce..e228638ce 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VrCapabilities.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VrCapabilities.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/WarningLightStatus.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/WarningLightStatus.java
index 3d002e651..3d002e651 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/WarningLightStatus.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/WarningLightStatus.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/WayPointType.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/WayPointType.java
index 120facaef..120facaef 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/WayPointType.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/WayPointType.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/WiperStatus.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/WiperStatus.java
index 546cf05b5..546cf05b5 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/WiperStatus.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/WiperStatus.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnMultipleRequestListener.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnMultipleRequestListener.java
index a8e9f31b8..a8e9f31b8 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnMultipleRequestListener.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnMultipleRequestListener.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnPutFileUpdateListener.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnPutFileUpdateListener.java
index 1a8e4f35f..1a8e4f35f 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnPutFileUpdateListener.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnPutFileUpdateListener.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCListener.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCListener.java
index 8de606b7c..8de606b7c 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCListener.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCListener.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCNotificationListener.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCNotificationListener.java
index e760618b1..e760618b1 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCNotificationListener.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCNotificationListener.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCRequestListener.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCRequestListener.java
index df3f4bc3f..df3f4bc3f 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCRequestListener.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCRequestListener.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCResponseListener.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCResponseListener.java
index 2c40fe0df..2c40fe0df 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCResponseListener.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCResponseListener.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/security/ISecurityInitializedListener.java b/android/sdl_android/src/main/java/com/smartdevicelink/security/ISecurityInitializedListener.java
index f18152ed0..f18152ed0 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/security/ISecurityInitializedListener.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/security/ISecurityInitializedListener.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/security/SdlSecurityBase.java b/android/sdl_android/src/main/java/com/smartdevicelink/security/SdlSecurityBase.java
index b3f324267..b3f324267 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/security/SdlSecurityBase.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/security/SdlSecurityBase.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/streaming/AbstractPacketizer.java b/android/sdl_android/src/main/java/com/smartdevicelink/streaming/AbstractPacketizer.java
index 1a2c393cd..1a2c393cd 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/streaming/AbstractPacketizer.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/streaming/AbstractPacketizer.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/streaming/IStreamListener.java b/android/sdl_android/src/main/java/com/smartdevicelink/streaming/IStreamListener.java
index 2e19cf578..2e19cf578 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/streaming/IStreamListener.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/streaming/IStreamListener.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/streaming/StreamPacketizer.java b/android/sdl_android/src/main/java/com/smartdevicelink/streaming/StreamPacketizer.java
index bd51768ea..bd51768ea 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/streaming/StreamPacketizer.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/streaming/StreamPacketizer.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/streaming/StreamRPCPacketizer.java b/android/sdl_android/src/main/java/com/smartdevicelink/streaming/StreamRPCPacketizer.java
index 8aab788c9..8aab788c9 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/streaming/StreamRPCPacketizer.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/streaming/StreamRPCPacketizer.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/streaming/audio/AudioStreamingCodec.java b/android/sdl_android/src/main/java/com/smartdevicelink/streaming/audio/AudioStreamingCodec.java
index bf69a792b..bf69a792b 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/streaming/audio/AudioStreamingCodec.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/streaming/audio/AudioStreamingCodec.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/streaming/audio/AudioStreamingLPCMParams.java b/android/sdl_android/src/main/java/com/smartdevicelink/streaming/audio/AudioStreamingLPCMParams.java
index bde6abc4c..bde6abc4c 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/streaming/audio/AudioStreamingLPCMParams.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/streaming/audio/AudioStreamingLPCMParams.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/streaming/audio/AudioStreamingParams.java b/android/sdl_android/src/main/java/com/smartdevicelink/streaming/audio/AudioStreamingParams.java
index fe0f7a981..fe0f7a981 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/streaming/audio/AudioStreamingParams.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/streaming/audio/AudioStreamingParams.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/streaming/video/RTPH264Packetizer.java b/android/sdl_android/src/main/java/com/smartdevicelink/streaming/video/RTPH264Packetizer.java
index b35fd61c4..b35fd61c4 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/streaming/video/RTPH264Packetizer.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/streaming/video/RTPH264Packetizer.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/streaming/video/SdlRemoteDisplay.java b/android/sdl_android/src/main/java/com/smartdevicelink/streaming/video/SdlRemoteDisplay.java
index 8af6b1c59..8af6b1c59 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/streaming/video/SdlRemoteDisplay.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/streaming/video/SdlRemoteDisplay.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/streaming/video/VideoStreamingParameters.java b/android/sdl_android/src/main/java/com/smartdevicelink/streaming/video/VideoStreamingParameters.java
index 121176cc2..121176cc2 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/streaming/video/VideoStreamingParameters.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/streaming/video/VideoStreamingParameters.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/trace/DiagLevel.java b/android/sdl_android/src/main/java/com/smartdevicelink/trace/DiagLevel.java
index 26dfdebff..26dfdebff 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/trace/DiagLevel.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/trace/DiagLevel.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/trace/ISTListener.java b/android/sdl_android/src/main/java/com/smartdevicelink/trace/ISTListener.java
index 3af7d5020..3af7d5020 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/trace/ISTListener.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/trace/ISTListener.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/trace/Mime.java b/android/sdl_android/src/main/java/com/smartdevicelink/trace/Mime.java
index 799ac98f4..799ac98f4 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/trace/Mime.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/trace/Mime.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/trace/OpenRPCMessage.java b/android/sdl_android/src/main/java/com/smartdevicelink/trace/OpenRPCMessage.java
index 35a8de749..35a8de749 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/trace/OpenRPCMessage.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/trace/OpenRPCMessage.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/trace/SdlTrace.java b/android/sdl_android/src/main/java/com/smartdevicelink/trace/SdlTrace.java
index 2d997b1c4..2d997b1c4 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/trace/SdlTrace.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/trace/SdlTrace.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/trace/TraceDeviceInfo.java b/android/sdl_android/src/main/java/com/smartdevicelink/trace/TraceDeviceInfo.java
index 83c612d76..83c612d76 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/trace/TraceDeviceInfo.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/trace/TraceDeviceInfo.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/trace/enums/DetailLevel.java b/android/sdl_android/src/main/java/com/smartdevicelink/trace/enums/DetailLevel.java
index bd213679d..bd213679d 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/trace/enums/DetailLevel.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/trace/enums/DetailLevel.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/trace/enums/InterfaceActivityDirection.java b/android/sdl_android/src/main/java/com/smartdevicelink/trace/enums/InterfaceActivityDirection.java
index 0865d2e32..0865d2e32 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/trace/enums/InterfaceActivityDirection.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/trace/enums/InterfaceActivityDirection.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/trace/enums/Mod.java b/android/sdl_android/src/main/java/com/smartdevicelink/trace/enums/Mod.java
index b363473b2..b363473b2 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/trace/enums/Mod.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/trace/enums/Mod.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/transport/BTTransport.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/BTTransport.java
index 74ca18478..74ca18478 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/transport/BTTransport.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/BTTransport.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/transport/BTTransportConfig.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/BTTransportConfig.java
index 0f2c4a7e5..0f2c4a7e5 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/transport/BTTransportConfig.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/BTTransportConfig.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/transport/BaseTransportConfig.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/BaseTransportConfig.java
index 4b7fe79be..4b7fe79be 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/transport/BaseTransportConfig.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/BaseTransportConfig.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/transport/ITransportListener.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/ITransportListener.java
index b4c4a9b33..b4c4a9b33 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/transport/ITransportListener.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/ITransportListener.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexBaseTransport.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexBaseTransport.java
index d1dc5cbb3..d1dc5cbb3 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexBaseTransport.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexBaseTransport.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexBluetoothTransport.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexBluetoothTransport.java
index dd66784f7..dd66784f7 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexBluetoothTransport.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexBluetoothTransport.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexTcpTransport.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexTcpTransport.java
index d5843f4c2..d5843f4c2 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexTcpTransport.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexTcpTransport.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexTransport.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexTransport.java
index eac5a27e0..eac5a27e0 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexTransport.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexTransport.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexTransportConfig.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexTransportConfig.java
index 8a3e39d20..8a3e39d20 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexTransportConfig.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexTransportConfig.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexUsbTransport.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexUsbTransport.java
index 7ebcec1c2..7ebcec1c2 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexUsbTransport.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexUsbTransport.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/transport/RouterServiceValidator.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/RouterServiceValidator.java
index 868c71054..868c71054 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/transport/RouterServiceValidator.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/RouterServiceValidator.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/transport/SdlBroadcastReceiver.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlBroadcastReceiver.java
index 94025de30..94025de30 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/transport/SdlBroadcastReceiver.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlBroadcastReceiver.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/transport/SdlPsm.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlPsm.java
index f5b650722..f5b650722 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/transport/SdlPsm.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlPsm.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java
index e0f71a121..e0f71a121 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterStatusProvider.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterStatusProvider.java
index 734a16b58..734a16b58 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterStatusProvider.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterStatusProvider.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/transport/SdlTransport.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlTransport.java
index 27c87bcef..27c87bcef 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/transport/SdlTransport.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlTransport.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/transport/SiphonServer.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/SiphonServer.java
index ab8a8a7bd..ab8a8a7bd 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/transport/SiphonServer.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/SiphonServer.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/transport/TCPTransport.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/TCPTransport.java
index c858c7790..c858c7790 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/transport/TCPTransport.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/TCPTransport.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/transport/TCPTransportConfig.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/TCPTransportConfig.java
index 8ff3f2172..8ff3f2172 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/transport/TCPTransportConfig.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/TCPTransportConfig.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/transport/TransportBroker.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/TransportBroker.java
index 7bdd10857..7bdd10857 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/transport/TransportBroker.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/TransportBroker.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/transport/TransportConstants.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/TransportConstants.java
index a66651502..a66651502 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/transport/TransportConstants.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/TransportConstants.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/transport/TransportManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/TransportManager.java
index 5892390cd..5892390cd 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/transport/TransportManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/TransportManager.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/transport/USBAccessoryAttachmentActivity.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/USBAccessoryAttachmentActivity.java
index 878715147..878715147 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/transport/USBAccessoryAttachmentActivity.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/USBAccessoryAttachmentActivity.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/transport/USBTransport.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/USBTransport.java
index 9b1bf1efd..9b1bf1efd 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/transport/USBTransport.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/USBTransport.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/transport/USBTransportConfig.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/USBTransportConfig.java
index b819a6844..b819a6844 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/transport/USBTransportConfig.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/USBTransportConfig.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/transport/UsbTransferProvider.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/UsbTransferProvider.java
index 1479fa9e1..1479fa9e1 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/transport/UsbTransferProvider.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/UsbTransferProvider.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/transport/enums/TransportType.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/enums/TransportType.java
index 2c09c72fc..2c09c72fc 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/transport/enums/TransportType.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/enums/TransportType.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/transport/utl/ByteAraryMessageAssembler.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/ByteAraryMessageAssembler.java
index 61fd2e13e..61fd2e13e 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/transport/utl/ByteAraryMessageAssembler.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/ByteAraryMessageAssembler.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/transport/utl/ByteArrayMessageSpliter.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/ByteArrayMessageSpliter.java
index 999fdacb3..999fdacb3 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/transport/utl/ByteArrayMessageSpliter.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/ByteArrayMessageSpliter.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/transport/utl/TransportRecord.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/TransportRecord.java
index bcfc2e373..bcfc2e373 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/transport/utl/TransportRecord.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/TransportRecord.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/transport/utl/WiFiSocketFactory.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/WiFiSocketFactory.java
index b35070d89..b35070d89 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/transport/utl/WiFiSocketFactory.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/WiFiSocketFactory.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/util/AndroidTools.java b/android/sdl_android/src/main/java/com/smartdevicelink/util/AndroidTools.java
index 4237845b7..4237845b7 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/util/AndroidTools.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/util/AndroidTools.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/util/BitConverter.java b/android/sdl_android/src/main/java/com/smartdevicelink/util/BitConverter.java
index a681a75a8..a681a75a8 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/util/BitConverter.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/util/BitConverter.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/util/ByteEnumer.java b/android/sdl_android/src/main/java/com/smartdevicelink/util/ByteEnumer.java
index 0b67d9992..0b67d9992 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/util/ByteEnumer.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/util/ByteEnumer.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/util/CorrelationIdGenerator.java b/android/sdl_android/src/main/java/com/smartdevicelink/util/CorrelationIdGenerator.java
index 18ff93622..18ff93622 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/util/CorrelationIdGenerator.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/util/CorrelationIdGenerator.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/util/DebugTool.java b/android/sdl_android/src/main/java/com/smartdevicelink/util/DebugTool.java
index 2ea9cc938..2ea9cc938 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/util/DebugTool.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/util/DebugTool.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/util/HttpRequestTask.java b/android/sdl_android/src/main/java/com/smartdevicelink/util/HttpRequestTask.java
index 5e8bba95c..5e8bba95c 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/util/HttpRequestTask.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/util/HttpRequestTask.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/util/HttpUtils.java b/android/sdl_android/src/main/java/com/smartdevicelink/util/HttpUtils.java
index 77b1a8004..77b1a8004 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/util/HttpUtils.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/util/HttpUtils.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/util/IConsole.java b/android/sdl_android/src/main/java/com/smartdevicelink/util/IConsole.java
index 8d6d4a0f1..8d6d4a0f1 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/util/IConsole.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/util/IConsole.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/util/NativeLogTool.java b/android/sdl_android/src/main/java/com/smartdevicelink/util/NativeLogTool.java
index c89b970dc..c89b970dc 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/util/NativeLogTool.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/util/NativeLogTool.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/util/SdlAppInfo.java b/android/sdl_android/src/main/java/com/smartdevicelink/util/SdlAppInfo.java
index bdc588b1b..bdc588b1b 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/util/SdlAppInfo.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/util/SdlAppInfo.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/util/SdlDataTypeConverter.java b/android/sdl_android/src/main/java/com/smartdevicelink/util/SdlDataTypeConverter.java
index 0b47a59cd..0b47a59cd 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/util/SdlDataTypeConverter.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/util/SdlDataTypeConverter.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/util/ServiceFinder.java b/android/sdl_android/src/main/java/com/smartdevicelink/util/ServiceFinder.java
index ba19310e8..ba19310e8 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/util/ServiceFinder.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/util/ServiceFinder.java
diff --git a/sdl_android/src/main/java/com/smartdevicelink/util/Version.java b/android/sdl_android/src/main/java/com/smartdevicelink/util/Version.java
index 78eac8db4..78eac8db4 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/util/Version.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/util/Version.java
diff --git a/sdl_android/src/main/res/drawable-hdpi/ic_sdl.png b/android/sdl_android/src/main/res/drawable-hdpi/ic_sdl.png
index 3b2d27849..3b2d27849 100644
--- a/sdl_android/src/main/res/drawable-hdpi/ic_sdl.png
+++ b/android/sdl_android/src/main/res/drawable-hdpi/ic_sdl.png
Binary files differ
diff --git a/sdl_android/src/main/res/drawable-hdpi/sdl_lockscreen_icon.png b/android/sdl_android/src/main/res/drawable-hdpi/sdl_lockscreen_icon.png
index 625eb35ea..625eb35ea 100644
--- a/sdl_android/src/main/res/drawable-hdpi/sdl_lockscreen_icon.png
+++ b/android/sdl_android/src/main/res/drawable-hdpi/sdl_lockscreen_icon.png
Binary files differ
diff --git a/sdl_android/src/main/res/drawable-hdpi/sdl_tray_icon.png b/android/sdl_android/src/main/res/drawable-hdpi/sdl_tray_icon.png
index ae81fa257..ae81fa257 100644
--- a/sdl_android/src/main/res/drawable-hdpi/sdl_tray_icon.png
+++ b/android/sdl_android/src/main/res/drawable-hdpi/sdl_tray_icon.png
Binary files differ
diff --git a/sdl_android/src/main/res/drawable-mdpi/ic_sdl.png b/android/sdl_android/src/main/res/drawable-mdpi/ic_sdl.png
index 09464468e..09464468e 100644
--- a/sdl_android/src/main/res/drawable-mdpi/ic_sdl.png
+++ b/android/sdl_android/src/main/res/drawable-mdpi/ic_sdl.png
Binary files differ
diff --git a/sdl_android/src/main/res/drawable-mdpi/sdl_lockscreen_icon.png b/android/sdl_android/src/main/res/drawable-mdpi/sdl_lockscreen_icon.png
index d13a55e0b..d13a55e0b 100644
--- a/sdl_android/src/main/res/drawable-mdpi/sdl_lockscreen_icon.png
+++ b/android/sdl_android/src/main/res/drawable-mdpi/sdl_lockscreen_icon.png
Binary files differ
diff --git a/sdl_android/src/main/res/drawable-mdpi/sdl_tray_icon.png b/android/sdl_android/src/main/res/drawable-mdpi/sdl_tray_icon.png
index 17eedac5e..17eedac5e 100644
--- a/sdl_android/src/main/res/drawable-mdpi/sdl_tray_icon.png
+++ b/android/sdl_android/src/main/res/drawable-mdpi/sdl_tray_icon.png
Binary files differ
diff --git a/sdl_android/src/main/res/drawable-mdpi/transparent.png b/android/sdl_android/src/main/res/drawable-mdpi/transparent.png
index f21003d3a..f21003d3a 100644
--- a/sdl_android/src/main/res/drawable-mdpi/transparent.png
+++ b/android/sdl_android/src/main/res/drawable-mdpi/transparent.png
Binary files differ
diff --git a/sdl_android/src/main/res/drawable-xhdpi/ic_sdl.png b/android/sdl_android/src/main/res/drawable-xhdpi/ic_sdl.png
index 3694e4276..3694e4276 100644
--- a/sdl_android/src/main/res/drawable-xhdpi/ic_sdl.png
+++ b/android/sdl_android/src/main/res/drawable-xhdpi/ic_sdl.png
Binary files differ
diff --git a/sdl_android/src/main/res/drawable-xhdpi/sdl_lockscreen_icon.png b/android/sdl_android/src/main/res/drawable-xhdpi/sdl_lockscreen_icon.png
index d7de7cabe..d7de7cabe 100644
--- a/sdl_android/src/main/res/drawable-xhdpi/sdl_lockscreen_icon.png
+++ b/android/sdl_android/src/main/res/drawable-xhdpi/sdl_lockscreen_icon.png
Binary files differ
diff --git a/sdl_android/src/main/res/drawable-xhdpi/sdl_tray_icon.png b/android/sdl_android/src/main/res/drawable-xhdpi/sdl_tray_icon.png
index 90b0c71b6..90b0c71b6 100644
--- a/sdl_android/src/main/res/drawable-xhdpi/sdl_tray_icon.png
+++ b/android/sdl_android/src/main/res/drawable-xhdpi/sdl_tray_icon.png
Binary files differ
diff --git a/sdl_android/src/main/res/drawable-xxhdpi/ic_sdl.png b/android/sdl_android/src/main/res/drawable-xxhdpi/ic_sdl.png
index 0ff901fb4..0ff901fb4 100644
--- a/sdl_android/src/main/res/drawable-xxhdpi/ic_sdl.png
+++ b/android/sdl_android/src/main/res/drawable-xxhdpi/ic_sdl.png
Binary files differ
diff --git a/sdl_android/src/main/res/drawable-xxhdpi/sdl_lockscreen_icon.png b/android/sdl_android/src/main/res/drawable-xxhdpi/sdl_lockscreen_icon.png
index bd0c40e67..bd0c40e67 100644
--- a/sdl_android/src/main/res/drawable-xxhdpi/sdl_lockscreen_icon.png
+++ b/android/sdl_android/src/main/res/drawable-xxhdpi/sdl_lockscreen_icon.png
Binary files differ
diff --git a/sdl_android/src/main/res/drawable-xxhdpi/sdl_tray_icon.png b/android/sdl_android/src/main/res/drawable-xxhdpi/sdl_tray_icon.png
index 029fc9d07..029fc9d07 100644
--- a/sdl_android/src/main/res/drawable-xxhdpi/sdl_tray_icon.png
+++ b/android/sdl_android/src/main/res/drawable-xxhdpi/sdl_tray_icon.png
Binary files differ
diff --git a/sdl_android/src/main/res/drawable-xxxhdpi/ic_sdl.png b/android/sdl_android/src/main/res/drawable-xxxhdpi/ic_sdl.png
index b46511edd..b46511edd 100644
--- a/sdl_android/src/main/res/drawable-xxxhdpi/ic_sdl.png
+++ b/android/sdl_android/src/main/res/drawable-xxxhdpi/ic_sdl.png
Binary files differ
diff --git a/sdl_android/src/main/res/drawable-xxxhdpi/sdl_lockscreen_icon.png b/android/sdl_android/src/main/res/drawable-xxxhdpi/sdl_lockscreen_icon.png
index 21962c148..21962c148 100644
--- a/sdl_android/src/main/res/drawable-xxxhdpi/sdl_lockscreen_icon.png
+++ b/android/sdl_android/src/main/res/drawable-xxxhdpi/sdl_lockscreen_icon.png
Binary files differ
diff --git a/sdl_android/src/main/res/drawable-xxxhdpi/sdl_tray_icon.png b/android/sdl_android/src/main/res/drawable-xxxhdpi/sdl_tray_icon.png
index 06e49819b..06e49819b 100644
--- a/sdl_android/src/main/res/drawable-xxxhdpi/sdl_tray_icon.png
+++ b/android/sdl_android/src/main/res/drawable-xxxhdpi/sdl_tray_icon.png
Binary files differ
diff --git a/sdl_android/src/main/res/layout/activity_sdllock_screen.xml b/android/sdl_android/src/main/res/layout/activity_sdllock_screen.xml
index dd2c2a6bb..dd2c2a6bb 100644
--- a/sdl_android/src/main/res/layout/activity_sdllock_screen.xml
+++ b/android/sdl_android/src/main/res/layout/activity_sdllock_screen.xml
diff --git a/sdl_android/src/main/res/values/sdl.xml b/android/sdl_android/src/main/res/values/sdl.xml
index 8ee8f70cb..8ee8f70cb 100644
--- a/sdl_android/src/main/res/values/sdl.xml
+++ b/android/sdl_android/src/main/res/values/sdl.xml
diff --git a/sdl_android/src/main/res/values/strings.xml b/android/sdl_android/src/main/res/values/strings.xml
index 1d55ec24d..1d55ec24d 100644
--- a/sdl_android/src/main/res/values/strings.xml
+++ b/android/sdl_android/src/main/res/values/strings.xml
diff --git a/sdl_android/src/main/res/xml/accessory_filter.xml b/android/sdl_android/src/main/res/xml/accessory_filter.xml
index 4b0ab7c83..4b0ab7c83 100644
--- a/sdl_android/src/main/res/xml/accessory_filter.xml
+++ b/android/sdl_android/src/main/res/xml/accessory_filter.xml
diff --git a/sdl_android/src/test/java/com/smartdevicelink/ExampleUnitTest.java b/android/sdl_android/src/test/java/com/smartdevicelink/ExampleUnitTest.java
index 1a82a259f..1a82a259f 100644
--- a/sdl_android/src/test/java/com/smartdevicelink/ExampleUnitTest.java
+++ b/android/sdl_android/src/test/java/com/smartdevicelink/ExampleUnitTest.java
diff --git a/sdl_android/src/test/java/com/smartdevicelink/haptic/HapticInterfaceManagerTest.java b/android/sdl_android/src/test/java/com/smartdevicelink/haptic/HapticInterfaceManagerTest.java
index 87c547bb1..87c547bb1 100644
--- a/sdl_android/src/test/java/com/smartdevicelink/haptic/HapticInterfaceManagerTest.java
+++ b/android/sdl_android/src/test/java/com/smartdevicelink/haptic/HapticInterfaceManagerTest.java
diff --git a/settings.gradle b/android/settings.gradle
index a358feb22..a358feb22 100644
--- a/settings.gradle
+++ b/android/settings.gradle
diff --git a/third_party.md b/android/third_party.md
index 667e841a9..667e841a9 100644
--- a/third_party.md
+++ b/android/third_party.md