Move rpc and enums dirs to base

344 files changed, 0 insertions, 0 deletions

diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/protocol/enums/ControlFrameTags.java b/base/src/main/java/com/smartdevicelink/protocol/enums/ControlFrameTags.java
index 0dd46ecfd..0dd46ecfd 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/protocol/enums/ControlFrameTags.java
+++ b/base/src/main/java/com/smartdevicelink/protocol/enums/ControlFrameTags.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/protocol/enums/FrameData.java b/base/src/main/java/com/smartdevicelink/protocol/enums/FrameData.java
index bff606c3b..bff606c3b 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/protocol/enums/FrameData.java
+++ b/base/src/main/java/com/smartdevicelink/protocol/enums/FrameData.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/protocol/enums/FrameDataControlFrameType.java b/base/src/main/java/com/smartdevicelink/protocol/enums/FrameDataControlFrameType.java
index bef31fe5c..bef31fe5c 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/protocol/enums/FrameDataControlFrameType.java
+++ b/base/src/main/java/com/smartdevicelink/protocol/enums/FrameDataControlFrameType.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/protocol/enums/FrameType.java b/base/src/main/java/com/smartdevicelink/protocol/enums/FrameType.java
index d724807d0..d724807d0 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/protocol/enums/FrameType.java
+++ b/base/src/main/java/com/smartdevicelink/protocol/enums/FrameType.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/protocol/enums/FunctionID.java b/base/src/main/java/com/smartdevicelink/protocol/enums/FunctionID.java
index 4fd4d1d73..4fd4d1d73 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/protocol/enums/FunctionID.java
+++ b/base/src/main/java/com/smartdevicelink/protocol/enums/FunctionID.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/protocol/enums/MessageType.java b/base/src/main/java/com/smartdevicelink/protocol/enums/MessageType.java
index 87f5b9eb3..87f5b9eb3 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/protocol/enums/MessageType.java
+++ b/base/src/main/java/com/smartdevicelink/protocol/enums/MessageType.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/protocol/enums/SessionType.java b/base/src/main/java/com/smartdevicelink/protocol/enums/SessionType.java
index f6cd888b4..f6cd888b4 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/protocol/enums/SessionType.java
+++ b/base/src/main/java/com/smartdevicelink/protocol/enums/SessionType.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AddCommand.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/AddCommand.java
index 9dec67b7d..9dec67b7d 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AddCommand.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/AddCommand.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AddCommandResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/AddCommandResponse.java
index 27a19a53e..27a19a53e 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AddCommandResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/AddCommandResponse.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AddSubMenu.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/AddSubMenu.java
index a272e5455..a272e5455 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AddSubMenu.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/AddSubMenu.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AddSubMenuResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/AddSubMenuResponse.java
index dff7cd091..dff7cd091 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AddSubMenuResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/AddSubMenuResponse.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AirbagStatus.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/AirbagStatus.java
index 06542c942..06542c942 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AirbagStatus.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/AirbagStatus.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Alert.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/Alert.java
index d0c4e0400..d0c4e0400 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Alert.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/Alert.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AlertManeuver.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/AlertManeuver.java
index 4fd218fa8..4fd218fa8 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AlertManeuver.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/AlertManeuver.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AlertManeuverResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/AlertManeuverResponse.java
index f1a71bd66..f1a71bd66 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AlertManeuverResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/AlertManeuverResponse.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AlertResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/AlertResponse.java
index c95be6e37..c95be6e37 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AlertResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/AlertResponse.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AppServiceCapability.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/AppServiceCapability.java
index 07be9f023..07be9f023 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AppServiceCapability.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/AppServiceCapability.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AppServiceData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/AppServiceData.java
index ba0966580..ba0966580 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AppServiceData.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/AppServiceData.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AppServiceManifest.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/AppServiceManifest.java
index d5cee2365..d5cee2365 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AppServiceManifest.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/AppServiceManifest.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AppServiceRecord.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/AppServiceRecord.java
index 6d2d74d6d..6d2d74d6d 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AppServiceRecord.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/AppServiceRecord.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AppServicesCapabilities.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/AppServicesCapabilities.java
index ab09b1f5b..ab09b1f5b 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AppServicesCapabilities.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/AppServicesCapabilities.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AudioControlCapabilities.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/AudioControlCapabilities.java
index fcaa7bf4c..fcaa7bf4c 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AudioControlCapabilities.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/AudioControlCapabilities.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AudioControlData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/AudioControlData.java
index b6ec0bfb1..b6ec0bfb1 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AudioControlData.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/AudioControlData.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AudioPassThruCapabilities.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/AudioPassThruCapabilities.java
index 675ddbbfc..675ddbbfc 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AudioPassThruCapabilities.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/AudioPassThruCapabilities.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/BeltStatus.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/BeltStatus.java
index 65a7e674e..65a7e674e 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/BeltStatus.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/BeltStatus.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/BodyInformation.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/BodyInformation.java
index b2f4cd2f3..b2f4cd2f3 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/BodyInformation.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/BodyInformation.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ButtonCapabilities.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/ButtonCapabilities.java
index b79685d12..b79685d12 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ButtonCapabilities.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/ButtonCapabilities.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ButtonPress.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/ButtonPress.java
index 94fb75083..94fb75083 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ButtonPress.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/ButtonPress.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ButtonPressResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/ButtonPressResponse.java
index f2644160e..f2644160e 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ButtonPressResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/ButtonPressResponse.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ChangeRegistration.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/ChangeRegistration.java
index f2981412f..f2981412f 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ChangeRegistration.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/ChangeRegistration.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ChangeRegistrationResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/ChangeRegistrationResponse.java
index 4c1b0209b..4c1b0209b 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ChangeRegistrationResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/ChangeRegistrationResponse.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Choice.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/Choice.java
index e93196bd5..e93196bd5 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Choice.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/Choice.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ClimateControlCapabilities.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/ClimateControlCapabilities.java
index 335fffa48..335fffa48 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ClimateControlCapabilities.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/ClimateControlCapabilities.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ClimateControlData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/ClimateControlData.java
index 1229e4668..1229e4668 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ClimateControlData.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/ClimateControlData.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/CloudAppProperties.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/CloudAppProperties.java
index 6538496ee..6538496ee 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/CloudAppProperties.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/CloudAppProperties.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ClusterModeStatus.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/ClusterModeStatus.java
index 93ea9b604..93ea9b604 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ClusterModeStatus.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/ClusterModeStatus.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Coordinate.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/Coordinate.java
index f886ff52a..f886ff52a 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Coordinate.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/Coordinate.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/CreateInteractionChoiceSet.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/CreateInteractionChoiceSet.java
index 07f17d1e6..07f17d1e6 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/CreateInteractionChoiceSet.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/CreateInteractionChoiceSet.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/CreateInteractionChoiceSetResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/CreateInteractionChoiceSetResponse.java
index db368bb61..db368bb61 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/CreateInteractionChoiceSetResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/CreateInteractionChoiceSetResponse.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DIDResult.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/DIDResult.java
index b739e8789..b739e8789 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DIDResult.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/DIDResult.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DTC.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/DTC.java
index 57595672e..57595672e 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DTC.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/DTC.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DateTime.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/DateTime.java
index 1c3af0e88..1c3af0e88 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DateTime.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/DateTime.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteCommand.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/DeleteCommand.java
index b08fa56c3..b08fa56c3 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteCommand.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/DeleteCommand.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteCommandResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/DeleteCommandResponse.java
index c6b5c994c..c6b5c994c 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteCommandResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/DeleteCommandResponse.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteFile.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/DeleteFile.java
index c9a0e76c7..c9a0e76c7 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteFile.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/DeleteFile.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteFileResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/DeleteFileResponse.java
index 918ca7fce..918ca7fce 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteFileResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/DeleteFileResponse.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteInteractionChoiceSet.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/DeleteInteractionChoiceSet.java
index 741675419..741675419 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteInteractionChoiceSet.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/DeleteInteractionChoiceSet.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteInteractionChoiceSetResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/DeleteInteractionChoiceSetResponse.java
index d122975a0..d122975a0 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteInteractionChoiceSetResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/DeleteInteractionChoiceSetResponse.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteSubMenu.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/DeleteSubMenu.java
index 97c4042e3..97c4042e3 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteSubMenu.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/DeleteSubMenu.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteSubMenuResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/DeleteSubMenuResponse.java
index d13c850df..d13c850df 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteSubMenuResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/DeleteSubMenuResponse.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeviceInfo.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/DeviceInfo.java
index 485d859b7..485d859b7 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeviceInfo.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/DeviceInfo.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeviceStatus.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/DeviceStatus.java
index 40382b81a..40382b81a 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeviceStatus.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/DeviceStatus.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DiagnosticMessage.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/DiagnosticMessage.java
index 3d40ba31d..3d40ba31d 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DiagnosticMessage.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/DiagnosticMessage.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DiagnosticMessageResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/DiagnosticMessageResponse.java
index 096acbd50..096acbd50 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DiagnosticMessageResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/DiagnosticMessageResponse.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DialNumber.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/DialNumber.java
index 4707efc86..4707efc86 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DialNumber.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/DialNumber.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DialNumberResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/DialNumberResponse.java
index ff2cef3be..ff2cef3be 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DialNumberResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/DialNumberResponse.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DisplayCapabilities.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/DisplayCapabilities.java
index c8c761440..c8c761440 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DisplayCapabilities.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/DisplayCapabilities.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ECallInfo.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/ECallInfo.java
index 93a973aab..93a973aab 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ECallInfo.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/ECallInfo.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/EmergencyEvent.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/EmergencyEvent.java
index ab2ed9377..ab2ed9377 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/EmergencyEvent.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/EmergencyEvent.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/EndAudioPassThru.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/EndAudioPassThru.java
index ab61c548e..ab61c548e 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/EndAudioPassThru.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/EndAudioPassThru.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/EndAudioPassThruResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/EndAudioPassThruResponse.java
index fddb8a30c..fddb8a30c 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/EndAudioPassThruResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/EndAudioPassThruResponse.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/EqualizerSettings.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/EqualizerSettings.java
index 78e76c808..78e76c808 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/EqualizerSettings.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/EqualizerSettings.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/FuelRange.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/FuelRange.java
index 01027aa8d..01027aa8d 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/FuelRange.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/FuelRange.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GPSData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/GPSData.java
index ca264556f..ca264556f 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GPSData.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/GPSData.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GenericResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/GenericResponse.java
index a92c237e3..a92c237e3 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GenericResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/GenericResponse.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetAppServiceData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetAppServiceData.java
index bfc0e43be..bfc0e43be 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetAppServiceData.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetAppServiceData.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetAppServiceDataResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetAppServiceDataResponse.java
index db2dea526..db2dea526 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetAppServiceDataResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetAppServiceDataResponse.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetCloudAppProperties.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetCloudAppProperties.java
index 032ae7dad..032ae7dad 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetCloudAppProperties.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetCloudAppProperties.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetCloudAppPropertiesResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetCloudAppPropertiesResponse.java
index 7577dd396..7577dd396 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetCloudAppPropertiesResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetCloudAppPropertiesResponse.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetDTCs.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetDTCs.java
index 23eeac0d4..23eeac0d4 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetDTCs.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetDTCs.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetDTCsResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetDTCsResponse.java
index 802f6b34a..802f6b34a 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetDTCsResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetDTCsResponse.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetFile.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetFile.java
index 51913be77..51913be77 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetFile.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetFile.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetFileResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetFileResponse.java
index 10d8bb72e..10d8bb72e 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetFileResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetFileResponse.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetInteriorVehicleData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetInteriorVehicleData.java
index dc6ab5444..dc6ab5444 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetInteriorVehicleData.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetInteriorVehicleData.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetInteriorVehicleDataResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetInteriorVehicleDataResponse.java
index 88d663805..88d663805 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetInteriorVehicleDataResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetInteriorVehicleDataResponse.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetSystemCapability.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetSystemCapability.java
index 9d8529d6d..9d8529d6d 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetSystemCapability.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetSystemCapability.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetSystemCapabilityResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetSystemCapabilityResponse.java
index afcc8c48c..afcc8c48c 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetSystemCapabilityResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetSystemCapabilityResponse.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleData.java
index b847b37bc..b847b37bc 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleData.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleData.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleDataResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleDataResponse.java
index fc26a2c9a..fc26a2c9a 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleDataResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleDataResponse.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetWayPoints.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetWayPoints.java
index 95b076e52..95b076e52 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetWayPoints.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetWayPoints.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetWayPointsResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetWayPointsResponse.java
index 32344ffbd..32344ffbd 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetWayPointsResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetWayPointsResponse.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HMICapabilities.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/HMICapabilities.java
index 8f4cdfe66..8f4cdfe66 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HMICapabilities.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/HMICapabilities.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HMIPermissions.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/HMIPermissions.java
index 307ff8b06..307ff8b06 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HMIPermissions.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/HMIPermissions.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HMISettingsControlCapabilities.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/HMISettingsControlCapabilities.java
index f5377b1b0..f5377b1b0 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HMISettingsControlCapabilities.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/HMISettingsControlCapabilities.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HMISettingsControlData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/HMISettingsControlData.java
index e6dc4d301..e6dc4d301 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HMISettingsControlData.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/HMISettingsControlData.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HapticRect.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/HapticRect.java
index a102f3eb1..a102f3eb1 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HapticRect.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/HapticRect.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HeadLampStatus.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/HeadLampStatus.java
index 68ffc88ad..68ffc88ad 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HeadLampStatus.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/HeadLampStatus.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Headers.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/Headers.java
index 2ae607100..2ae607100 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Headers.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/Headers.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Image.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/Image.java
index f58664054..f58664054 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Image.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/Image.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ImageField.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/ImageField.java
index 6114f28c0..6114f28c0 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ImageField.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/ImageField.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ImageResolution.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/ImageResolution.java
index 2eb69f652..2eb69f652 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ImageResolution.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/ImageResolution.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/KeyboardProperties.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/KeyboardProperties.java
index d74914cb3..d74914cb3 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/KeyboardProperties.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/KeyboardProperties.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/LightCapabilities.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/LightCapabilities.java
index b23c8356c..b23c8356c 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/LightCapabilities.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/LightCapabilities.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/LightControlCapabilities.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/LightControlCapabilities.java
index ab84da275..ab84da275 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/LightControlCapabilities.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/LightControlCapabilities.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/LightControlData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/LightControlData.java
index a78b979c5..a78b979c5 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/LightControlData.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/LightControlData.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/LightState.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/LightState.java
index 90315f785..90315f785 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/LightState.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/LightState.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ListFiles.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/ListFiles.java
index faeaa7977..faeaa7977 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ListFiles.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/ListFiles.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ListFilesResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/ListFilesResponse.java
index b525bc599..b525bc599 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ListFilesResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/ListFilesResponse.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/LocationDetails.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/LocationDetails.java
index 51d150a2b..51d150a2b 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/LocationDetails.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/LocationDetails.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MassageCushionFirmness.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/MassageCushionFirmness.java
index 8e87eff7d..8e87eff7d 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MassageCushionFirmness.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/MassageCushionFirmness.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MassageModeData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/MassageModeData.java
index 857d4dc7c..857d4dc7c 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MassageModeData.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/MassageModeData.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MediaServiceData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/MediaServiceData.java
index bf4b960eb..bf4b960eb 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MediaServiceData.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/MediaServiceData.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MediaServiceManifest.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/MediaServiceManifest.java
index 22d66e7e7..22d66e7e7 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MediaServiceManifest.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/MediaServiceManifest.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MenuParams.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/MenuParams.java
index 841cf6b90..841cf6b90 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MenuParams.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/MenuParams.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MetadataTags.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/MetadataTags.java
index dc5a9b5aa..dc5a9b5aa 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MetadataTags.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/MetadataTags.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ModuleData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/ModuleData.java
index 85a24c064..85a24c064 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ModuleData.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/ModuleData.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MyKey.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/MyKey.java
index 3393f527a..3393f527a 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MyKey.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/MyKey.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/NavigationCapability.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/NavigationCapability.java
index c3d0d59f8..c3d0d59f8 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/NavigationCapability.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/NavigationCapability.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/NavigationInstruction.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/NavigationInstruction.java
index 5052e55f9..5052e55f9 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/NavigationInstruction.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/NavigationInstruction.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/NavigationServiceData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/NavigationServiceData.java
index 4c1817954..4c1817954 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/NavigationServiceData.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/NavigationServiceData.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/NavigationServiceManifest.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/NavigationServiceManifest.java
index 54da7bdd1..54da7bdd1 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/NavigationServiceManifest.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/NavigationServiceManifest.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OasisAddress.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OasisAddress.java
index 54b95e300..54b95e300 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OasisAddress.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/OasisAddress.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnAppInterfaceUnregistered.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnAppInterfaceUnregistered.java
index adc3296c1..adc3296c1 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnAppInterfaceUnregistered.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnAppInterfaceUnregistered.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnAppServiceData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnAppServiceData.java
index 48cab3cd6..48cab3cd6 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnAppServiceData.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnAppServiceData.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnAudioPassThru.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnAudioPassThru.java
index 40186c63d..40186c63d 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnAudioPassThru.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnAudioPassThru.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnButtonEvent.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnButtonEvent.java
index 28bf0b3ce..28bf0b3ce 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnButtonEvent.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnButtonEvent.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnButtonPress.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnButtonPress.java
index f96548ec2..f96548ec2 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnButtonPress.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnButtonPress.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnCommand.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnCommand.java
index 0a7f1e89d..0a7f1e89d 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnCommand.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnCommand.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnDriverDistraction.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnDriverDistraction.java
index 8bd45e528..8bd45e528 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnDriverDistraction.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnDriverDistraction.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnHMIStatus.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnHMIStatus.java
index 6c79eeb5d..6c79eeb5d 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnHMIStatus.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnHMIStatus.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnHashChange.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnHashChange.java
index 2a4581f06..2a4581f06 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnHashChange.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnHashChange.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnInteriorVehicleData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnInteriorVehicleData.java
index a91a720c4..a91a720c4 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnInteriorVehicleData.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnInteriorVehicleData.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnKeyboardInput.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnKeyboardInput.java
index 5bf3b8893..5bf3b8893 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnKeyboardInput.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnKeyboardInput.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnLanguageChange.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnLanguageChange.java
index 5464eb359..5464eb359 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnLanguageChange.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnLanguageChange.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnLockScreenStatus.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnLockScreenStatus.java
index 21a5c3520..21a5c3520 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnLockScreenStatus.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnLockScreenStatus.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnPermissionsChange.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnPermissionsChange.java
index efe1c184b..efe1c184b 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnPermissionsChange.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnPermissionsChange.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnRCStatus.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnRCStatus.java
index 8be1e0007..8be1e0007 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnRCStatus.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnRCStatus.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnSdlChoiceChosen.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnSdlChoiceChosen.java
index 5eec2db91..5eec2db91 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnSdlChoiceChosen.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnSdlChoiceChosen.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnStreamRPC.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnStreamRPC.java
index 679596026..679596026 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnStreamRPC.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnStreamRPC.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnSystemCapabilityUpdated.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnSystemCapabilityUpdated.java
index 37d34b420..37d34b420 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnSystemCapabilityUpdated.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnSystemCapabilityUpdated.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnSystemRequest.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnSystemRequest.java
index 9654d8c2a..9654d8c2a 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnSystemRequest.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnSystemRequest.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnTBTClientState.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnTBTClientState.java
index fad694373..fad694373 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnTBTClientState.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnTBTClientState.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnTouchEvent.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnTouchEvent.java
index 7504c9197..7504c9197 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnTouchEvent.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnTouchEvent.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnVehicleData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnVehicleData.java
index 7b97f9286..7b97f9286 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnVehicleData.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnVehicleData.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnWayPointChange.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnWayPointChange.java
index cb9130e1a..cb9130e1a 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnWayPointChange.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnWayPointChange.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ParameterPermissions.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/ParameterPermissions.java
index 5fbb00b74..5fbb00b74 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ParameterPermissions.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/ParameterPermissions.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformAppServiceInteraction.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/PerformAppServiceInteraction.java
index 37dd36684..37dd36684 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformAppServiceInteraction.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/PerformAppServiceInteraction.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformAppServiceInteractionResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/PerformAppServiceInteractionResponse.java
index 718c6526b..718c6526b 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformAppServiceInteractionResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/PerformAppServiceInteractionResponse.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformAudioPassThru.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/PerformAudioPassThru.java
index bbd0c32e3..bbd0c32e3 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformAudioPassThru.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/PerformAudioPassThru.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformAudioPassThruResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/PerformAudioPassThruResponse.java
index f68a412f0..f68a412f0 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformAudioPassThruResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/PerformAudioPassThruResponse.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformInteraction.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/PerformInteraction.java
index 9067edb98..9067edb98 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformInteraction.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/PerformInteraction.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformInteractionResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/PerformInteractionResponse.java
index 5bd4afe8c..5bd4afe8c 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformInteractionResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/PerformInteractionResponse.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PermissionItem.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/PermissionItem.java
index 24695a872..24695a872 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PermissionItem.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/PermissionItem.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PhoneCapability.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/PhoneCapability.java
index c317e0eb9..c317e0eb9 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PhoneCapability.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/PhoneCapability.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PresetBankCapabilities.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/PresetBankCapabilities.java
index 79d7c9546..79d7c9546 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PresetBankCapabilities.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/PresetBankCapabilities.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PublishAppService.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/PublishAppService.java
index ae11f06c6..ae11f06c6 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PublishAppService.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/PublishAppService.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PublishAppServiceResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/PublishAppServiceResponse.java
index 753ad30a0..753ad30a0 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PublishAppServiceResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/PublishAppServiceResponse.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PutFile.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/PutFile.java
index 2d9010600..2d9010600 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PutFile.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/PutFile.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PutFileResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/PutFileResponse.java
index f8d4a3bca..f8d4a3bca 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PutFileResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/PutFileResponse.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RGBColor.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/RGBColor.java
index 81d43161d..81d43161d 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RGBColor.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/RGBColor.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RadioControlCapabilities.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/RadioControlCapabilities.java
index ac46368d8..ac46368d8 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RadioControlCapabilities.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/RadioControlCapabilities.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RadioControlData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/RadioControlData.java
index fcedfdb0f..fcedfdb0f 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RadioControlData.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/RadioControlData.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RdsData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/RdsData.java
index 2ed934865..2ed934865 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RdsData.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/RdsData.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ReadDID.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/ReadDID.java
index 7d62cf019..7d62cf019 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ReadDID.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/ReadDID.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ReadDIDResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/ReadDIDResponse.java
index 3cf835906..3cf835906 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ReadDIDResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/ReadDIDResponse.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Rectangle.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/Rectangle.java
index d2545b5e5..d2545b5e5 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Rectangle.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/Rectangle.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RegisterAppInterface.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/RegisterAppInterface.java
index 5ba1e623d..5ba1e623d 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RegisterAppInterface.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/RegisterAppInterface.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RegisterAppInterfaceResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/RegisterAppInterfaceResponse.java
index 746129a85..746129a85 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RegisterAppInterfaceResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/RegisterAppInterfaceResponse.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RemoteControlCapabilities.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/RemoteControlCapabilities.java
index 4c9861101..4c9861101 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RemoteControlCapabilities.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/RemoteControlCapabilities.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ResetGlobalProperties.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/ResetGlobalProperties.java
index 2adb03ec1..2adb03ec1 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ResetGlobalProperties.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/ResetGlobalProperties.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ResetGlobalPropertiesResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/ResetGlobalPropertiesResponse.java
index 78f245ea8..78f245ea8 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ResetGlobalPropertiesResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/ResetGlobalPropertiesResponse.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ScreenParams.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/ScreenParams.java
index e9a3168e7..e9a3168e7 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ScreenParams.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/ScreenParams.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ScrollableMessage.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/ScrollableMessage.java
index 2ee1230f7..2ee1230f7 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ScrollableMessage.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/ScrollableMessage.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ScrollableMessageResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/ScrollableMessageResponse.java
index 2113e3095..2113e3095 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ScrollableMessageResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/ScrollableMessageResponse.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SdlMsgVersion.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SdlMsgVersion.java
index 3e1637e22..3e1637e22 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SdlMsgVersion.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SdlMsgVersion.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SeatControlCapabilities.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SeatControlCapabilities.java
index e1d488cb5..e1d488cb5 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SeatControlCapabilities.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SeatControlCapabilities.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SeatControlData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SeatControlData.java
index 26d52d713..26d52d713 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SeatControlData.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SeatControlData.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SeatMemoryAction.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SeatMemoryAction.java
index a8673a9eb..a8673a9eb 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SeatMemoryAction.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SeatMemoryAction.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SendHapticData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SendHapticData.java
index a93fd2b98..a93fd2b98 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SendHapticData.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SendHapticData.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SendHapticDataResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SendHapticDataResponse.java
index 58761a4a5..58761a4a5 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SendHapticDataResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SendHapticDataResponse.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SendLocation.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SendLocation.java
index c25f57648..c25f57648 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SendLocation.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SendLocation.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SendLocationResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SendLocationResponse.java
index dc1193a8b..dc1193a8b 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SendLocationResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SendLocationResponse.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetAppIcon.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SetAppIcon.java
index 02ee081c2..02ee081c2 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetAppIcon.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SetAppIcon.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetAppIconResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SetAppIconResponse.java
index 45e6ff180..45e6ff180 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetAppIconResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SetAppIconResponse.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetCloudAppProperties.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SetCloudAppProperties.java
index 5f6160361..5f6160361 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetCloudAppProperties.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SetCloudAppProperties.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetCloudAppPropertiesResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SetCloudAppPropertiesResponse.java
index ea3e79d00..ea3e79d00 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetCloudAppPropertiesResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SetCloudAppPropertiesResponse.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetDisplayLayout.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SetDisplayLayout.java
index 2bff6d1ec..2bff6d1ec 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetDisplayLayout.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SetDisplayLayout.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetDisplayLayoutResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SetDisplayLayoutResponse.java
index 48b98bd24..48b98bd24 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetDisplayLayoutResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SetDisplayLayoutResponse.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetGlobalProperties.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SetGlobalProperties.java
index edd943494..edd943494 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetGlobalProperties.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SetGlobalProperties.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetGlobalPropertiesResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SetGlobalPropertiesResponse.java
index 89b5219a5..89b5219a5 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetGlobalPropertiesResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SetGlobalPropertiesResponse.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetInteriorVehicleData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SetInteriorVehicleData.java
index ad5a0d26a..ad5a0d26a 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetInteriorVehicleData.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SetInteriorVehicleData.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetInteriorVehicleDataResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SetInteriorVehicleDataResponse.java
index 837b36fc7..837b36fc7 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetInteriorVehicleDataResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SetInteriorVehicleDataResponse.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetMediaClockTimer.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SetMediaClockTimer.java
index 9063430a5..9063430a5 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetMediaClockTimer.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SetMediaClockTimer.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetMediaClockTimerResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SetMediaClockTimerResponse.java
index 56a63c947..56a63c947 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetMediaClockTimerResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SetMediaClockTimerResponse.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Show.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/Show.java
index 6a42fe1a8..6a42fe1a8 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Show.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/Show.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ShowConstantTbt.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/ShowConstantTbt.java
index 6a44b9068..6a44b9068 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ShowConstantTbt.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/ShowConstantTbt.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ShowConstantTbtResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/ShowConstantTbtResponse.java
index 5482a00ae..5482a00ae 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ShowConstantTbtResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/ShowConstantTbtResponse.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ShowResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/ShowResponse.java
index 1187f6687..1187f6687 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ShowResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/ShowResponse.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SingleTireStatus.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SingleTireStatus.java
index e3a63c276..e3a63c276 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SingleTireStatus.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SingleTireStatus.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SisData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SisData.java
index 13b30e37d..13b30e37d 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SisData.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SisData.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Slider.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/Slider.java
index df92e22fe..df92e22fe 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Slider.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/Slider.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SliderResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SliderResponse.java
index b7f4a08a6..b7f4a08a6 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SliderResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SliderResponse.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SoftButton.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SoftButton.java
index cd4517dcd..cd4517dcd 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SoftButton.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SoftButton.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SoftButtonCapabilities.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SoftButtonCapabilities.java
index 9299e1b2b..9299e1b2b 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SoftButtonCapabilities.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SoftButtonCapabilities.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Speak.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/Speak.java
index 8a0b3a380..8a0b3a380 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Speak.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/Speak.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SpeakResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SpeakResponse.java
index 5f78b609b..5f78b609b 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SpeakResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SpeakResponse.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/StartTime.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/StartTime.java
index 97efa8c05..97efa8c05 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/StartTime.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/StartTime.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/StationIDNumber.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/StationIDNumber.java
index a8e926a2b..a8e926a2b 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/StationIDNumber.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/StationIDNumber.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/StreamRPCResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/StreamRPCResponse.java
index d1de24993..d1de24993 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/StreamRPCResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/StreamRPCResponse.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeButton.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeButton.java
index 80e988e35..80e988e35 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeButton.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeButton.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeButtonResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeButtonResponse.java
index fbed88bbc..fbed88bbc 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeButtonResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeButtonResponse.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleData.java
index 700f1dcb9..700f1dcb9 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleData.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleData.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleDataResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleDataResponse.java
index cc27233a8..cc27233a8 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleDataResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleDataResponse.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeWayPoints.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeWayPoints.java
index e0d3627e2..e0d3627e2 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeWayPoints.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeWayPoints.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeWayPointsResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeWayPointsResponse.java
index 8ca946c5c..8ca946c5c 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeWayPointsResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeWayPointsResponse.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SystemCapability.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SystemCapability.java
index 4450a83d4..4450a83d4 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SystemCapability.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SystemCapability.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SystemRequest.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SystemRequest.java
index ee7dad05b..ee7dad05b 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SystemRequest.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SystemRequest.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SystemRequestResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SystemRequestResponse.java
index fab8b09ba..fab8b09ba 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SystemRequestResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SystemRequestResponse.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TTSChunk.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/TTSChunk.java
index a1e26d6b2..a1e26d6b2 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TTSChunk.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/TTSChunk.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Temperature.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/Temperature.java
index 87513a3cd..87513a3cd 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Temperature.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/Temperature.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TemplateColorScheme.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/TemplateColorScheme.java
index db915a4eb..db915a4eb 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TemplateColorScheme.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/TemplateColorScheme.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TextField.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/TextField.java
index 23e5c148f..23e5c148f 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TextField.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/TextField.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TireStatus.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/TireStatus.java
index 15028cc9e..15028cc9e 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TireStatus.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/TireStatus.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TouchCoord.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/TouchCoord.java
index b14dcfaec..b14dcfaec 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TouchCoord.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/TouchCoord.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TouchEvent.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/TouchEvent.java
index 0abb75062..0abb75062 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TouchEvent.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/TouchEvent.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TouchEventCapabilities.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/TouchEventCapabilities.java
index c8c441158..c8c441158 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TouchEventCapabilities.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/TouchEventCapabilities.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Turn.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/Turn.java
index 323974019..323974019 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Turn.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/Turn.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnregisterAppInterface.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/UnregisterAppInterface.java
index b832d81c4..b832d81c4 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnregisterAppInterface.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/UnregisterAppInterface.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnregisterAppInterfaceResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/UnregisterAppInterfaceResponse.java
index 4660dc24e..4660dc24e 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnregisterAppInterfaceResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/UnregisterAppInterfaceResponse.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeButton.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeButton.java
index 53a4e9162..53a4e9162 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeButton.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeButton.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeButtonResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeButtonResponse.java
index 5d6bd8579..5d6bd8579 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeButtonResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeButtonResponse.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleData.java
index e682fa518..e682fa518 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleData.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleData.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleDataResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleDataResponse.java
index c2ba69cfa..c2ba69cfa 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleDataResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleDataResponse.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeWayPoints.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeWayPoints.java
index b748ef673..b748ef673 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeWayPoints.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeWayPoints.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeWayPointsResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeWayPointsResponse.java
index b7feef73e..b7feef73e 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeWayPointsResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeWayPointsResponse.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UpdateTurnList.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/UpdateTurnList.java
index cb1dde7e4..cb1dde7e4 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UpdateTurnList.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/UpdateTurnList.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UpdateTurnListResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/UpdateTurnListResponse.java
index 5b0fbabf7..5b0fbabf7 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UpdateTurnListResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/UpdateTurnListResponse.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VehicleDataResult.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/VehicleDataResult.java
index 10860deab..10860deab 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VehicleDataResult.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/VehicleDataResult.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VehicleType.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/VehicleType.java
index e6f860007..e6f860007 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VehicleType.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/VehicleType.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VideoStreamingCapability.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/VideoStreamingCapability.java
index c558673e5..c558673e5 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VideoStreamingCapability.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/VideoStreamingCapability.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VideoStreamingFormat.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/VideoStreamingFormat.java
index 0ddfec2ef..0ddfec2ef 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VideoStreamingFormat.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/VideoStreamingFormat.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VrHelpItem.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/VrHelpItem.java
index 39fb08b8b..39fb08b8b 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VrHelpItem.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/VrHelpItem.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/WeatherAlert.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/WeatherAlert.java
index 3131b0998..3131b0998 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/WeatherAlert.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/WeatherAlert.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/WeatherData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/WeatherData.java
index a71261902..a71261902 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/WeatherData.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/WeatherData.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/WeatherServiceData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/WeatherServiceData.java
index 07a0b99a8..07a0b99a8 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/WeatherServiceData.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/WeatherServiceData.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/WeatherServiceManifest.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/WeatherServiceManifest.java
index 874b37e69..874b37e69 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/WeatherServiceManifest.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/WeatherServiceManifest.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AmbientLightStatus.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/AmbientLightStatus.java
index 3f4076b11..3f4076b11 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AmbientLightStatus.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/AmbientLightStatus.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AppHMIType.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/AppHMIType.java
index 1bb045006..1bb045006 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AppHMIType.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/AppHMIType.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AppInterfaceUnregisteredReason.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/AppInterfaceUnregisteredReason.java
index d4a7ff103..d4a7ff103 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AppInterfaceUnregisteredReason.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/AppInterfaceUnregisteredReason.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AppServiceType.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/AppServiceType.java
index a4b8e16c2..a4b8e16c2 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AppServiceType.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/AppServiceType.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AudioStreamingIndicator.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/AudioStreamingIndicator.java
index 00a15d9f0..00a15d9f0 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AudioStreamingIndicator.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/AudioStreamingIndicator.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AudioStreamingState.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/AudioStreamingState.java
index 50accb6bf..50accb6bf 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AudioStreamingState.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/AudioStreamingState.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AudioType.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/AudioType.java
index d340e0e4c..d340e0e4c 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AudioType.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/AudioType.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/BitsPerSample.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/BitsPerSample.java
index b21e138a9..b21e138a9 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/BitsPerSample.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/BitsPerSample.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ButtonEventMode.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/ButtonEventMode.java
index 33f1f0f49..33f1f0f49 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ButtonEventMode.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/ButtonEventMode.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ButtonName.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/ButtonName.java
index 6d4cecffc..6d4cecffc 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ButtonName.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/ButtonName.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ButtonPressMode.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/ButtonPressMode.java
index cc2852526..cc2852526 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ButtonPressMode.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/ButtonPressMode.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/CarModeStatus.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/CarModeStatus.java
index c44b457ec..c44b457ec 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/CarModeStatus.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/CarModeStatus.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/CharacterSet.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/CharacterSet.java
index b8c4c9535..b8c4c9535 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/CharacterSet.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/CharacterSet.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/CompassDirection.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/CompassDirection.java
index a450bf6ed..a450bf6ed 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/CompassDirection.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/CompassDirection.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ComponentVolumeStatus.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/ComponentVolumeStatus.java
index 64d5515ad..64d5515ad 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ComponentVolumeStatus.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/ComponentVolumeStatus.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/DefrostZone.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/DefrostZone.java
index 4c6b15e85..4c6b15e85 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/DefrostZone.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/DefrostZone.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/DeliveryMode.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/DeliveryMode.java
index 52361a97d..52361a97d 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/DeliveryMode.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/DeliveryMode.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/DeviceLevelStatus.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/DeviceLevelStatus.java
index 273dc83d3..273dc83d3 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/DeviceLevelStatus.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/DeviceLevelStatus.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/Dimension.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/Dimension.java
index 012803510..012803510 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/Dimension.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/Dimension.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/Direction.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/Direction.java
index 546d1316c..546d1316c 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/Direction.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/Direction.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/DisplayMode.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/DisplayMode.java
index 5a0c0c7e4..5a0c0c7e4 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/DisplayMode.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/DisplayMode.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/DisplayType.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/DisplayType.java
index 2a2996762..2a2996762 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/DisplayType.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/DisplayType.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/DistanceUnit.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/DistanceUnit.java
index 36e103bf3..36e103bf3 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/DistanceUnit.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/DistanceUnit.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/DriverDistractionState.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/DriverDistractionState.java
index 890488c5e..890488c5e 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/DriverDistractionState.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/DriverDistractionState.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ECallConfirmationStatus.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/ECallConfirmationStatus.java
index b7a341d9e..b7a341d9e 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ECallConfirmationStatus.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/ECallConfirmationStatus.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ElectronicParkBrakeStatus.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/ElectronicParkBrakeStatus.java
index f3951c7a1..f3951c7a1 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ElectronicParkBrakeStatus.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/ElectronicParkBrakeStatus.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/EmergencyEventType.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/EmergencyEventType.java
index 374a6c7e2..374a6c7e2 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/EmergencyEventType.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/EmergencyEventType.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/FileType.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/FileType.java
index 54e5ce8b8..54e5ce8b8 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/FileType.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/FileType.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/FuelCutoffStatus.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/FuelCutoffStatus.java
index 266f13afb..266f13afb 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/FuelCutoffStatus.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/FuelCutoffStatus.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/FuelType.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/FuelType.java
index 8241ebd45..8241ebd45 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/FuelType.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/FuelType.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/GlobalProperty.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/GlobalProperty.java
index a54d53d1d..a54d53d1d 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/GlobalProperty.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/GlobalProperty.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/HMILevel.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/HMILevel.java
index 8757a26ec..8757a26ec 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/HMILevel.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/HMILevel.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/HmiZoneCapabilities.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/HmiZoneCapabilities.java
index 4725b4ff4..4725b4ff4 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/HmiZoneCapabilities.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/HmiZoneCapabilities.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/HybridAppPreference.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/HybridAppPreference.java
index 16732e9c3..16732e9c3 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/HybridAppPreference.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/HybridAppPreference.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/IgnitionStableStatus.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/IgnitionStableStatus.java
index 91d6ecf8e..91d6ecf8e 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/IgnitionStableStatus.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/IgnitionStableStatus.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/IgnitionStatus.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/IgnitionStatus.java
index b17ccf1cf..b17ccf1cf 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/IgnitionStatus.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/IgnitionStatus.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ImageFieldName.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/ImageFieldName.java
index 799b1e99d..799b1e99d 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ImageFieldName.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/ImageFieldName.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ImageType.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/ImageType.java
index 5b79257e1..5b79257e1 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ImageType.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/ImageType.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/InteractionMode.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/InteractionMode.java
index 98b61a1f2..98b61a1f2 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/InteractionMode.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/InteractionMode.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/Jingle.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/Jingle.java
index 85a1e8e67..85a1e8e67 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/Jingle.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/Jingle.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/KeyboardEvent.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/KeyboardEvent.java
index 7a730377d..7a730377d 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/KeyboardEvent.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/KeyboardEvent.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/KeyboardLayout.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/KeyboardLayout.java
index 2cd71b3f3..2cd71b3f3 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/KeyboardLayout.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/KeyboardLayout.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/KeypressMode.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/KeypressMode.java
index 32e198585..32e198585 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/KeypressMode.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/KeypressMode.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/Language.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/Language.java
index 4ac4f6264..4ac4f6264 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/Language.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/Language.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/LayoutMode.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/LayoutMode.java
index b64cf1bb3..b64cf1bb3 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/LayoutMode.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/LayoutMode.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/LightName.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/LightName.java
index c3812f2da..c3812f2da 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/LightName.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/LightName.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/LightStatus.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/LightStatus.java
index 98c4b175c..98c4b175c 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/LightStatus.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/LightStatus.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/LockScreenStatus.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/LockScreenStatus.java
index ba25a3024..ba25a3024 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/LockScreenStatus.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/LockScreenStatus.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/MassageCushion.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/MassageCushion.java
index ed23b4899..ed23b4899 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/MassageCushion.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/MassageCushion.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/MassageMode.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/MassageMode.java
index 59a200bdb..59a200bdb 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/MassageMode.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/MassageMode.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/MassageZone.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/MassageZone.java
index 9f0e23ffe..9f0e23ffe 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/MassageZone.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/MassageZone.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/MediaClockFormat.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/MediaClockFormat.java
index 2bf84744a..2bf84744a 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/MediaClockFormat.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/MediaClockFormat.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/MediaType.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/MediaType.java
index f28face34..f28face34 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/MediaType.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/MediaType.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/MetadataType.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/MetadataType.java
index 9f51a6437..9f51a6437 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/MetadataType.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/MetadataType.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ModuleType.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/ModuleType.java
index c4bedfd46..c4bedfd46 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ModuleType.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/ModuleType.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/NavigationAction.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/NavigationAction.java
index 2619b5505..2619b5505 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/NavigationAction.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/NavigationAction.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/NavigationJunction.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/NavigationJunction.java
index 693582a13..693582a13 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/NavigationJunction.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/NavigationJunction.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/PRNDL.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/PRNDL.java
index 965ebb8b4..965ebb8b4 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/PRNDL.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/PRNDL.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/PowerModeQualificationStatus.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/PowerModeQualificationStatus.java
index c268e14aa..c268e14aa 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/PowerModeQualificationStatus.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/PowerModeQualificationStatus.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/PowerModeStatus.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/PowerModeStatus.java
index 06ed3ba9a..06ed3ba9a 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/PowerModeStatus.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/PowerModeStatus.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/PredefinedLayout.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/PredefinedLayout.java
index 458320d1e..458320d1e 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/PredefinedLayout.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/PredefinedLayout.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/PrerecordedSpeech.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/PrerecordedSpeech.java
index 2b27040a6..2b27040a6 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/PrerecordedSpeech.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/PrerecordedSpeech.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/PrimaryAudioSource.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/PrimaryAudioSource.java
index 27f83d7d4..27f83d7d4 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/PrimaryAudioSource.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/PrimaryAudioSource.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/RadioBand.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/RadioBand.java
index 2b2c862d8..2b2c862d8 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/RadioBand.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/RadioBand.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/RadioState.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/RadioState.java
index 533c86dca..533c86dca 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/RadioState.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/RadioState.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/RequestType.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/RequestType.java
index e6fbab6df..e6fbab6df 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/RequestType.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/RequestType.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/Result.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/Result.java
index 25b9a16f5..25b9a16f5 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/Result.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/Result.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SamplingRate.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/SamplingRate.java
index e659ff165..e659ff165 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SamplingRate.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/SamplingRate.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SdlConnectionState.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/SdlConnectionState.java
index fa2caecb6..fa2caecb6 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SdlConnectionState.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/SdlConnectionState.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SdlDisconnectedReason.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/SdlDisconnectedReason.java
index 6c83fc1d9..6c83fc1d9 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SdlDisconnectedReason.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/SdlDisconnectedReason.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SdlInterfaceAvailability.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/SdlInterfaceAvailability.java
index 0f6b2530c..0f6b2530c 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SdlInterfaceAvailability.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/SdlInterfaceAvailability.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SeatMemoryActionType.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/SeatMemoryActionType.java
index e81b2694a..e81b2694a 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SeatMemoryActionType.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/SeatMemoryActionType.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ServiceUpdateReason.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/ServiceUpdateReason.java
index 302feff3f..302feff3f 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ServiceUpdateReason.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/ServiceUpdateReason.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SoftButtonType.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/SoftButtonType.java
index 29fa27020..29fa27020 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SoftButtonType.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/SoftButtonType.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SpeechCapabilities.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/SpeechCapabilities.java
index 7d8330d0a..7d8330d0a 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SpeechCapabilities.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/SpeechCapabilities.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/StaticIconName.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/StaticIconName.java
index 455995ff3..455995ff3 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/StaticIconName.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/StaticIconName.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SupportedSeat.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/SupportedSeat.java
index c68f2e79d..c68f2e79d 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SupportedSeat.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/SupportedSeat.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SystemAction.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/SystemAction.java
index 835e9b1b9..835e9b1b9 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SystemAction.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/SystemAction.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SystemCapabilityType.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/SystemCapabilityType.java
index c9f612bec..c9f612bec 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SystemCapabilityType.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/SystemCapabilityType.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SystemContext.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/SystemContext.java
index 1ea9d60b1..1ea9d60b1 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SystemContext.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/SystemContext.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TBTState.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/TBTState.java
index d334ccad7..d334ccad7 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TBTState.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/TBTState.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TPMS.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/TPMS.java
index 69b60e211..69b60e211 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TPMS.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/TPMS.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TemperatureUnit.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/TemperatureUnit.java
index 6c9b04875..6c9b04875 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TemperatureUnit.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/TemperatureUnit.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TextAlignment.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/TextAlignment.java
index b188d6ba8..b188d6ba8 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TextAlignment.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/TextAlignment.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TextFieldName.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/TextFieldName.java
index ded9d0571..ded9d0571 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TextFieldName.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/TextFieldName.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TouchType.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/TouchType.java
index 7cc259aa4..7cc259aa4 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TouchType.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/TouchType.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TriggerSource.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/TriggerSource.java
index 169721705..169721705 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TriggerSource.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/TriggerSource.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TurnSignal.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/TurnSignal.java
index 923cd842e..923cd842e 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TurnSignal.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/TurnSignal.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/UpdateMode.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/UpdateMode.java
index cd9bf6dfe..cd9bf6dfe 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/UpdateMode.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/UpdateMode.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataEventStatus.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataEventStatus.java
index 64a5dd898..64a5dd898 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataEventStatus.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataEventStatus.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataNotificationStatus.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataNotificationStatus.java
index d7bca9fc7..d7bca9fc7 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataNotificationStatus.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataNotificationStatus.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataResultCode.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataResultCode.java
index 45c2e7c11..45c2e7c11 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataResultCode.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataResultCode.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataStatus.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataStatus.java
index 2245bbe71..2245bbe71 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataStatus.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataStatus.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataType.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataType.java
index 8694d67c1..8694d67c1 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataType.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataType.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VentilationMode.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/VentilationMode.java
index b7a2ae9a2..b7a2ae9a2 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VentilationMode.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/VentilationMode.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VideoStreamingCodec.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/VideoStreamingCodec.java
index a41c1d064..a41c1d064 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VideoStreamingCodec.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/VideoStreamingCodec.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VideoStreamingProtocol.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/VideoStreamingProtocol.java
index 412badcac..412badcac 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VideoStreamingProtocol.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/VideoStreamingProtocol.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VideoStreamingState.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/VideoStreamingState.java
index 80384016b..80384016b 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VideoStreamingState.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/VideoStreamingState.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VrCapabilities.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/VrCapabilities.java
index e228638ce..e228638ce 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VrCapabilities.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/VrCapabilities.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/WarningLightStatus.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/WarningLightStatus.java
index 3d002e651..3d002e651 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/WarningLightStatus.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/WarningLightStatus.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/WayPointType.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/WayPointType.java
index 120facaef..120facaef 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/WayPointType.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/WayPointType.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/WiperStatus.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/WiperStatus.java
index 546cf05b5..546cf05b5 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/WiperStatus.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/WiperStatus.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnMultipleRequestListener.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnMultipleRequestListener.java
index a8e9f31b8..a8e9f31b8 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnMultipleRequestListener.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnMultipleRequestListener.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnPutFileUpdateListener.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnPutFileUpdateListener.java
index 1a8e4f35f..1a8e4f35f 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnPutFileUpdateListener.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnPutFileUpdateListener.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCListener.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCListener.java
index 8de606b7c..8de606b7c 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCListener.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCListener.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCNotificationListener.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCNotificationListener.java
index e760618b1..e760618b1 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCNotificationListener.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCNotificationListener.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCRequestListener.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCRequestListener.java
index df3f4bc3f..df3f4bc3f 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCRequestListener.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCRequestListener.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCResponseListener.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCResponseListener.java
index 2c40fe0df..2c40fe0df 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCResponseListener.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCResponseListener.java