Move source files

325 files changed, 0 insertions, 0 deletions

diff --git a/sdl_android_lib/src/com/smartdevicelink/Dispatcher/IDispatchingStrategy.java b/sdl_android/src/main/java/com/smartdevicelink/Dispatcher/IDispatchingStrategy.java
index a4cfc150b..a4cfc150b 100644
--- a/sdl_android_lib/src/com/smartdevicelink/Dispatcher/IDispatchingStrategy.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/Dispatcher/IDispatchingStrategy.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/Dispatcher/ProxyMessageDispatcher.java b/sdl_android/src/main/java/com/smartdevicelink/Dispatcher/ProxyMessageDispatcher.java
index 8db6f51e7..8db6f51e7 100644
--- a/sdl_android_lib/src/com/smartdevicelink/Dispatcher/ProxyMessageDispatcher.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/Dispatcher/ProxyMessageDispatcher.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/SdlConnection/ISdlConnectionListener.java b/sdl_android/src/main/java/com/smartdevicelink/SdlConnection/ISdlConnectionListener.java
index f4b4c43d9..f4b4c43d9 100644
--- a/sdl_android_lib/src/com/smartdevicelink/SdlConnection/ISdlConnectionListener.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/SdlConnection/ISdlConnectionListener.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/SdlConnection/SdlConnection.java b/sdl_android/src/main/java/com/smartdevicelink/SdlConnection/SdlConnection.java
index 272c1878d..272c1878d 100644
--- a/sdl_android_lib/src/com/smartdevicelink/SdlConnection/SdlConnection.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/SdlConnection/SdlConnection.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/SdlConnection/SdlSession.java b/sdl_android/src/main/java/com/smartdevicelink/SdlConnection/SdlSession.java
index 1a9d051a6..1a9d051a6 100644
--- a/sdl_android_lib/src/com/smartdevicelink/SdlConnection/SdlSession.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/SdlConnection/SdlSession.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/encoder/SdlEncoder.java b/sdl_android/src/main/java/com/smartdevicelink/encoder/SdlEncoder.java
index 81e344840..81e344840 100644
--- a/sdl_android_lib/src/com/smartdevicelink/encoder/SdlEncoder.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/encoder/SdlEncoder.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/exception/SdlException.java b/sdl_android/src/main/java/com/smartdevicelink/exception/SdlException.java
index a67549515..a67549515 100644
--- a/sdl_android_lib/src/com/smartdevicelink/exception/SdlException.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/exception/SdlException.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/exception/SdlExceptionCause.java b/sdl_android/src/main/java/com/smartdevicelink/exception/SdlExceptionCause.java
index 4894ceca3..4894ceca3 100644
--- a/sdl_android_lib/src/com/smartdevicelink/exception/SdlExceptionCause.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/exception/SdlExceptionCause.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/marshal/JsonRPCMarshaller.java b/sdl_android/src/main/java/com/smartdevicelink/marshal/JsonRPCMarshaller.java
index 414538a19..414538a19 100644
--- a/sdl_android_lib/src/com/smartdevicelink/marshal/JsonRPCMarshaller.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/marshal/JsonRPCMarshaller.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/protocol/AbstractProtocol.java b/sdl_android/src/main/java/com/smartdevicelink/protocol/AbstractProtocol.java
index 8acc709e1..8acc709e1 100644
--- a/sdl_android_lib/src/com/smartdevicelink/protocol/AbstractProtocol.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/protocol/AbstractProtocol.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/protocol/BinaryFrameHeader.java b/sdl_android/src/main/java/com/smartdevicelink/protocol/BinaryFrameHeader.java
index eb8f36831..eb8f36831 100644
--- a/sdl_android_lib/src/com/smartdevicelink/protocol/BinaryFrameHeader.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/protocol/BinaryFrameHeader.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/protocol/IProtocolListener.java b/sdl_android/src/main/java/com/smartdevicelink/protocol/IProtocolListener.java
index b54ff66c8..b54ff66c8 100644
--- a/sdl_android_lib/src/com/smartdevicelink/protocol/IProtocolListener.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/protocol/IProtocolListener.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/protocol/ProtocolMessage.java b/sdl_android/src/main/java/com/smartdevicelink/protocol/ProtocolMessage.java
index 99b34aff6..99b34aff6 100644
--- a/sdl_android_lib/src/com/smartdevicelink/protocol/ProtocolMessage.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/protocol/ProtocolMessage.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/protocol/SdlPacket.aidl b/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlPacket.aidl
index cec80021e..cec80021e 100644
--- a/sdl_android_lib/src/com/smartdevicelink/protocol/SdlPacket.aidl
+++ b/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlPacket.aidl
diff --git a/sdl_android_lib/src/com/smartdevicelink/protocol/SdlPacket.java b/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlPacket.java
index 9c7a02852..9c7a02852 100644
--- a/sdl_android_lib/src/com/smartdevicelink/protocol/SdlPacket.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlPacket.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/protocol/SdlPacketFactory.java b/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlPacketFactory.java
index 5cc2807e8..5cc2807e8 100644
--- a/sdl_android_lib/src/com/smartdevicelink/protocol/SdlPacketFactory.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlPacketFactory.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/protocol/WiProProtocol.java b/sdl_android/src/main/java/com/smartdevicelink/protocol/WiProProtocol.java
index 7b36b1689..7b36b1689 100644
--- a/sdl_android_lib/src/com/smartdevicelink/protocol/WiProProtocol.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/protocol/WiProProtocol.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/protocol/enums/FrameData.java b/sdl_android/src/main/java/com/smartdevicelink/protocol/enums/FrameData.java
index bff606c3b..bff606c3b 100644
--- a/sdl_android_lib/src/com/smartdevicelink/protocol/enums/FrameData.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/protocol/enums/FrameData.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/protocol/enums/FrameDataControlFrameType.java b/sdl_android/src/main/java/com/smartdevicelink/protocol/enums/FrameDataControlFrameType.java
index fbcde6294..fbcde6294 100644
--- a/sdl_android_lib/src/com/smartdevicelink/protocol/enums/FrameDataControlFrameType.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/protocol/enums/FrameDataControlFrameType.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/protocol/enums/FrameType.java b/sdl_android/src/main/java/com/smartdevicelink/protocol/enums/FrameType.java
index d724807d0..d724807d0 100644
--- a/sdl_android_lib/src/com/smartdevicelink/protocol/enums/FrameType.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/protocol/enums/FrameType.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/protocol/enums/FunctionID.java b/sdl_android/src/main/java/com/smartdevicelink/protocol/enums/FunctionID.java
index e427141cf..e427141cf 100644
--- a/sdl_android_lib/src/com/smartdevicelink/protocol/enums/FunctionID.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/protocol/enums/FunctionID.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/protocol/enums/MessageType.java b/sdl_android/src/main/java/com/smartdevicelink/protocol/enums/MessageType.java
index 87f5b9eb3..87f5b9eb3 100644
--- a/sdl_android_lib/src/com/smartdevicelink/protocol/enums/MessageType.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/protocol/enums/MessageType.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/protocol/enums/SessionType.java b/sdl_android/src/main/java/com/smartdevicelink/protocol/enums/SessionType.java
index f6cd888b4..f6cd888b4 100644
--- a/sdl_android_lib/src/com/smartdevicelink/protocol/enums/SessionType.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/protocol/enums/SessionType.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/protocol/heartbeat/HeartbeatMonitor.java b/sdl_android/src/main/java/com/smartdevicelink/protocol/heartbeat/HeartbeatMonitor.java
index 0b7051c27..0b7051c27 100644
--- a/sdl_android_lib/src/com/smartdevicelink/protocol/heartbeat/HeartbeatMonitor.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/protocol/heartbeat/HeartbeatMonitor.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/protocol/heartbeat/IHeartbeatMonitor.java b/sdl_android/src/main/java/com/smartdevicelink/protocol/heartbeat/IHeartbeatMonitor.java
index ff4feb9cb..ff4feb9cb 100644
--- a/sdl_android_lib/src/com/smartdevicelink/protocol/heartbeat/IHeartbeatMonitor.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/protocol/heartbeat/IHeartbeatMonitor.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/protocol/heartbeat/IHeartbeatMonitorListener.java b/sdl_android/src/main/java/com/smartdevicelink/protocol/heartbeat/IHeartbeatMonitorListener.java
index 584115f21..584115f21 100644
--- a/sdl_android_lib/src/com/smartdevicelink/protocol/heartbeat/IHeartbeatMonitorListener.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/protocol/heartbeat/IHeartbeatMonitorListener.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/IProxyListener.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/IProxyListener.java
index 2ef06c3b9..2ef06c3b9 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/IProxyListener.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/IProxyListener.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/LockScreenManager.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/LockScreenManager.java
index 1188d28b9..1188d28b9 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/LockScreenManager.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/LockScreenManager.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/RPCMessage.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCMessage.java
index 9f3fbfbd9..9f3fbfbd9 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/RPCMessage.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCMessage.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/RPCNotification.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCNotification.java
index b9992e78b..b9992e78b 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/RPCNotification.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCNotification.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/RPCRequest.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCRequest.java
index 50493870d..50493870d 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/RPCRequest.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCRequest.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/RPCRequestFactory.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCRequestFactory.java
index e249839d5..e249839d5 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/RPCRequestFactory.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCRequestFactory.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/RPCResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCResponse.java
index 0a4dc2a70..0a4dc2a70 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/RPCResponse.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCResponse.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/RPCStreamController.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCStreamController.java
index 0e2af0bc6..0e2af0bc6 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/RPCStreamController.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCStreamController.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/RPCStruct.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCStruct.java
index 4aea8e146..4aea8e146 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/RPCStruct.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCStruct.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/SdlProxyALM.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyALM.java
index 2bdbdf82e..2bdbdf82e 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/SdlProxyALM.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyALM.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/SdlProxyBase.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java
index 8f6e60756..8f6e60756 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/SdlProxyBase.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/SdlProxyBuilder.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBuilder.java
index 9e6921a61..9e6921a61 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/SdlProxyBuilder.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBuilder.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/SdlProxyConfigurationResources.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyConfigurationResources.java
index d875b59ce..d875b59ce 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/SdlProxyConfigurationResources.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyConfigurationResources.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/TTSChunkFactory.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/TTSChunkFactory.java
index b8b847261..b8b847261 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/TTSChunkFactory.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/TTSChunkFactory.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/Version.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/Version.java
index 214792f85..214792f85 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/Version.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/Version.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/callbacks/InternalProxyMessage.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/callbacks/InternalProxyMessage.java
index dc03f5c72..dc03f5c72 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/callbacks/InternalProxyMessage.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/callbacks/InternalProxyMessage.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/callbacks/OnError.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/callbacks/OnError.java
index 0323afa15..0323afa15 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/callbacks/OnError.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/callbacks/OnError.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/callbacks/OnProxyClosed.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/callbacks/OnProxyClosed.java
index 9a32c4a8d..9a32c4a8d 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/callbacks/OnProxyClosed.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/callbacks/OnProxyClosed.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/callbacks/OnProxyOpened.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/callbacks/OnProxyOpened.java
index 1fa9c19eb..1fa9c19eb 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/callbacks/OnProxyOpened.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/callbacks/OnProxyOpened.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/callbacks/OnServiceEnded.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/callbacks/OnServiceEnded.java
index d69802e0f..d69802e0f 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/callbacks/OnServiceEnded.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/callbacks/OnServiceEnded.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/callbacks/OnServiceNACKed.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/callbacks/OnServiceNACKed.java
index 9eae5e4c4..9eae5e4c4 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/callbacks/OnServiceNACKed.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/callbacks/OnServiceNACKed.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/constants/Jingles.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/constants/Jingles.java
index b029e55e8..b029e55e8 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/constants/Jingles.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/constants/Jingles.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/constants/Names.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/constants/Names.java
index 26729e997..26729e997 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/constants/Names.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/constants/Names.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/interfaces/IProxyListenerALM.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/IProxyListenerALM.java
index 2fb5a4063..2fb5a4063 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/interfaces/IProxyListenerALM.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/IProxyListenerALM.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/interfaces/IProxyListenerBase.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/IProxyListenerBase.java
index 8b437e05e..8b437e05e 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/interfaces/IProxyListenerBase.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/IProxyListenerBase.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/interfaces/IPutFileResponseListener.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/IPutFileResponseListener.java
index 7929e86e6..7929e86e6 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/interfaces/IPutFileResponseListener.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/IPutFileResponseListener.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/AddCommand.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AddCommand.java
index 57b58ea5b..57b58ea5b 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/AddCommand.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AddCommand.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/AddCommandResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AddCommandResponse.java
index da908908b..da908908b 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/AddCommandResponse.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AddCommandResponse.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/AddSubMenu.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AddSubMenu.java
index 2edc70c50..2edc70c50 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/AddSubMenu.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AddSubMenu.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/AddSubMenuResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AddSubMenuResponse.java
index 6b386eef5..6b386eef5 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/AddSubMenuResponse.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AddSubMenuResponse.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/AirbagStatus.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AirbagStatus.java
index b80a9c2c4..b80a9c2c4 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/AirbagStatus.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AirbagStatus.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/Alert.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Alert.java
index 811d65a42..811d65a42 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/Alert.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Alert.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/AlertManeuver.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AlertManeuver.java
index fba595150..fba595150 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/AlertManeuver.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AlertManeuver.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/AlertManeuverResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AlertManeuverResponse.java
index 6ed8ca1a4..6ed8ca1a4 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/AlertManeuverResponse.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AlertManeuverResponse.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/AlertResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AlertResponse.java
index cea706d4e..cea706d4e 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/AlertResponse.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AlertResponse.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/AudioPassThruCapabilities.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AudioPassThruCapabilities.java
index 48cfd129b..48cfd129b 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/AudioPassThruCapabilities.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AudioPassThruCapabilities.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/BeltStatus.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/BeltStatus.java
index 71db21640..71db21640 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/BeltStatus.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/BeltStatus.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/BodyInformation.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/BodyInformation.java
index 038b1970e..038b1970e 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/BodyInformation.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/BodyInformation.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ButtonCapabilities.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ButtonCapabilities.java
index 9b15c5be9..9b15c5be9 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ButtonCapabilities.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ButtonCapabilities.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ChangeRegistration.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ChangeRegistration.java
index 2b4c69f42..2b4c69f42 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ChangeRegistration.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ChangeRegistration.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ChangeRegistrationResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ChangeRegistrationResponse.java
index e5404cad3..e5404cad3 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ChangeRegistrationResponse.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ChangeRegistrationResponse.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/Choice.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Choice.java
index 2bc59736e..2bc59736e 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/Choice.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Choice.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ClusterModeStatus.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ClusterModeStatus.java
index 17e16af65..17e16af65 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ClusterModeStatus.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ClusterModeStatus.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/Coordinate.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Coordinate.java
index 7e899168c..7e899168c 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/Coordinate.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Coordinate.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/CreateInteractionChoiceSet.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/CreateInteractionChoiceSet.java
index 97793558f..97793558f 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/CreateInteractionChoiceSet.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/CreateInteractionChoiceSet.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/CreateInteractionChoiceSetResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/CreateInteractionChoiceSetResponse.java
index 36adc2857..36adc2857 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/CreateInteractionChoiceSetResponse.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/CreateInteractionChoiceSetResponse.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DIDResult.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DIDResult.java
index 84afe2a70..84afe2a70 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DIDResult.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DIDResult.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DTC.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DTC.java
index e8ff471d8..e8ff471d8 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DTC.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DTC.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DateTime.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DateTime.java
index aeb302ffb..aeb302ffb 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DateTime.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DateTime.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DeleteCommand.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteCommand.java
index 635f85814..635f85814 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DeleteCommand.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteCommand.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DeleteCommandResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteCommandResponse.java
index ad905b1e0..ad905b1e0 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DeleteCommandResponse.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteCommandResponse.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DeleteFile.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteFile.java
index 4d35c6fd3..4d35c6fd3 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DeleteFile.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteFile.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DeleteFileResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteFileResponse.java
index 9916b95dc..9916b95dc 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DeleteFileResponse.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteFileResponse.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DeleteInteractionChoiceSet.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteInteractionChoiceSet.java
index 87f8cdbc3..87f8cdbc3 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DeleteInteractionChoiceSet.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteInteractionChoiceSet.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DeleteInteractionChoiceSetResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteInteractionChoiceSetResponse.java
index 5f29ed567..5f29ed567 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DeleteInteractionChoiceSetResponse.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteInteractionChoiceSetResponse.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DeleteSubMenu.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteSubMenu.java
index aac605f51..aac605f51 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DeleteSubMenu.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteSubMenu.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DeleteSubMenuResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteSubMenuResponse.java
index 3e2c36dd4..3e2c36dd4 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DeleteSubMenuResponse.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeleteSubMenuResponse.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DeviceInfo.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeviceInfo.java
index b7d8ea5cf..b7d8ea5cf 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DeviceInfo.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeviceInfo.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DeviceStatus.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeviceStatus.java
index 51d5304b4..51d5304b4 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DeviceStatus.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DeviceStatus.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DiagnosticMessage.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DiagnosticMessage.java
index 0a0d8f997..0a0d8f997 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DiagnosticMessage.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DiagnosticMessage.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DiagnosticMessageResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DiagnosticMessageResponse.java
index 8cb0bc8d4..8cb0bc8d4 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DiagnosticMessageResponse.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DiagnosticMessageResponse.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DialNumber.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DialNumber.java
index 4651e1f20..4651e1f20 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DialNumber.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DialNumber.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DialNumberResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DialNumberResponse.java
index 613755442..613755442 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DialNumberResponse.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DialNumberResponse.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DisplayCapabilities.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DisplayCapabilities.java
index f0739e371..f0739e371 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DisplayCapabilities.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DisplayCapabilities.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ECallInfo.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ECallInfo.java
index 88eb89e03..88eb89e03 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ECallInfo.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ECallInfo.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/EmergencyEvent.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/EmergencyEvent.java
index 5e1f2ede1..5e1f2ede1 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/EmergencyEvent.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/EmergencyEvent.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/EndAudioPassThru.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/EndAudioPassThru.java
index ab61c548e..ab61c548e 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/EndAudioPassThru.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/EndAudioPassThru.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/EndAudioPassThruResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/EndAudioPassThruResponse.java
index 4f7a09f7b..4f7a09f7b 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/EndAudioPassThruResponse.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/EndAudioPassThruResponse.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/GPSData.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GPSData.java
index d76b11355..d76b11355 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/GPSData.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GPSData.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/GenericResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GenericResponse.java
index 4618fd857..4618fd857 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/GenericResponse.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GenericResponse.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/GetDTCs.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetDTCs.java
index fa3ba1c01..fa3ba1c01 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/GetDTCs.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetDTCs.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/GetDTCsResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetDTCsResponse.java
index b3c49b251..b3c49b251 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/GetDTCsResponse.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetDTCsResponse.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/GetVehicleData.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleData.java
index 0c15c02c9..0c15c02c9 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/GetVehicleData.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleData.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/GetVehicleDataResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleDataResponse.java
index 51eb7a4b7..51eb7a4b7 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/GetVehicleDataResponse.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleDataResponse.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/GetWayPoints.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetWayPoints.java
index f9832da0e..f9832da0e 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/GetWayPoints.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetWayPoints.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/GetWayPointsResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetWayPointsResponse.java
index 24048c826..24048c826 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/GetWayPointsResponse.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetWayPointsResponse.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/HMICapabilities.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HMICapabilities.java
index efc94f57c..efc94f57c 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/HMICapabilities.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HMICapabilities.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/HMIPermissions.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HMIPermissions.java
index d8223279a..d8223279a 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/HMIPermissions.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HMIPermissions.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/HeadLampStatus.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HeadLampStatus.java
index 46a982fe2..46a982fe2 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/HeadLampStatus.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/HeadLampStatus.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/Headers.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Headers.java
index 2be4f1a17..2be4f1a17 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/Headers.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Headers.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/Image.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Image.java
index 76ad2d224..76ad2d224 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/Image.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Image.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ImageField.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ImageField.java
index 9e38dc264..9e38dc264 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ImageField.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ImageField.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ImageResolution.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ImageResolution.java
index 682092082..682092082 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ImageResolution.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ImageResolution.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/KeyboardProperties.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/KeyboardProperties.java
index fb35dcf24..fb35dcf24 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/KeyboardProperties.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/KeyboardProperties.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ListFiles.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ListFiles.java
index faeaa7977..faeaa7977 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ListFiles.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ListFiles.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ListFilesResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ListFilesResponse.java
index 2c7a62e3e..2c7a62e3e 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ListFilesResponse.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ListFilesResponse.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/LocationDetails.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/LocationDetails.java
index 50dcaf49b..50dcaf49b 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/LocationDetails.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/LocationDetails.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/MenuParams.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MenuParams.java
index a9f22238a..a9f22238a 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/MenuParams.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MenuParams.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/MyKey.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MyKey.java
index 4936f9fec..4936f9fec 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/MyKey.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MyKey.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OasisAddress.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OasisAddress.java
index 131edaa9a..131edaa9a 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OasisAddress.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OasisAddress.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnAppInterfaceUnregistered.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnAppInterfaceUnregistered.java
index af155226e..af155226e 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnAppInterfaceUnregistered.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnAppInterfaceUnregistered.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnAudioPassThru.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnAudioPassThru.java
index 40186c63d..40186c63d 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnAudioPassThru.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnAudioPassThru.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnButtonEvent.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnButtonEvent.java
index 7f9afb627..7f9afb627 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnButtonEvent.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnButtonEvent.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnButtonPress.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnButtonPress.java
index c881cc297..c881cc297 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnButtonPress.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnButtonPress.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnCommand.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnCommand.java
index eae7e77f8..eae7e77f8 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnCommand.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnCommand.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnDriverDistraction.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnDriverDistraction.java
index 69280ad21..69280ad21 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnDriverDistraction.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnDriverDistraction.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnHMIStatus.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnHMIStatus.java
index 31161f2f1..31161f2f1 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnHMIStatus.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnHMIStatus.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnHashChange.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnHashChange.java
index 776d69e4a..776d69e4a 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnHashChange.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnHashChange.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnKeyboardInput.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnKeyboardInput.java
index e71cda0a8..e71cda0a8 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnKeyboardInput.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnKeyboardInput.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnLanguageChange.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnLanguageChange.java
index 4f39d55cb..4f39d55cb 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnLanguageChange.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnLanguageChange.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnLockScreenStatus.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnLockScreenStatus.java
index 11f6469ef..11f6469ef 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnLockScreenStatus.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnLockScreenStatus.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnPermissionsChange.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnPermissionsChange.java
index 4c88c9baa..4c88c9baa 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnPermissionsChange.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnPermissionsChange.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnSdlChoiceChosen.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnSdlChoiceChosen.java
index a878ade77..a878ade77 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnSdlChoiceChosen.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnSdlChoiceChosen.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnStreamRPC.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnStreamRPC.java
index bb4bcc324..bb4bcc324 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnStreamRPC.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnStreamRPC.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnSystemRequest.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnSystemRequest.java
index a034626a9..a034626a9 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnSystemRequest.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnSystemRequest.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnTBTClientState.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnTBTClientState.java
index 26965c891..26965c891 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnTBTClientState.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnTBTClientState.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnTouchEvent.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnTouchEvent.java
index bfb31d789..bfb31d789 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnTouchEvent.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnTouchEvent.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnVehicleData.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnVehicleData.java
index 1a6baefef..1a6baefef 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnVehicleData.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnVehicleData.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnWayPointChange.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnWayPointChange.java
index 4e197b3eb..4e197b3eb 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnWayPointChange.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnWayPointChange.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ParameterPermissions.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ParameterPermissions.java
index 996de27ac..996de27ac 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ParameterPermissions.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ParameterPermissions.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/PerformAudioPassThru.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformAudioPassThru.java
index 0e663f63d..0e663f63d 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/PerformAudioPassThru.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformAudioPassThru.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/PerformAudioPassThruResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformAudioPassThruResponse.java
index 2e90356ed..2e90356ed 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/PerformAudioPassThruResponse.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformAudioPassThruResponse.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/PerformInteraction.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformInteraction.java
index 9ad8c1034..9ad8c1034 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/PerformInteraction.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformInteraction.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/PerformInteractionResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformInteractionResponse.java
index c2b56dcd0..c2b56dcd0 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/PerformInteractionResponse.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PerformInteractionResponse.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/PermissionItem.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PermissionItem.java
index 7776c12b7..7776c12b7 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/PermissionItem.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PermissionItem.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/PresetBankCapabilities.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PresetBankCapabilities.java
index df28213c7..df28213c7 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/PresetBankCapabilities.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PresetBankCapabilities.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/PutFile.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PutFile.java
index 065ad14d5..065ad14d5 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/PutFile.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PutFile.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/PutFileResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PutFileResponse.java
index b9195981b..b9195981b 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/PutFileResponse.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PutFileResponse.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ReadDID.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ReadDID.java
index 285416881..285416881 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ReadDID.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ReadDID.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ReadDIDResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ReadDIDResponse.java
index b21395b48..b21395b48 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ReadDIDResponse.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ReadDIDResponse.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/RegisterAppInterface.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RegisterAppInterface.java
index 99bcba01a..99bcba01a 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/RegisterAppInterface.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RegisterAppInterface.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/RegisterAppInterfaceResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RegisterAppInterfaceResponse.java
index f89e1a8b8..f89e1a8b8 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/RegisterAppInterfaceResponse.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RegisterAppInterfaceResponse.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ResetGlobalProperties.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ResetGlobalProperties.java
index 4a9f18d7f..4a9f18d7f 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ResetGlobalProperties.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ResetGlobalProperties.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ResetGlobalPropertiesResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ResetGlobalPropertiesResponse.java
index dec7cde94..dec7cde94 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ResetGlobalPropertiesResponse.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ResetGlobalPropertiesResponse.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ScreenParams.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ScreenParams.java
index fe2c626a0..fe2c626a0 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ScreenParams.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ScreenParams.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ScrollableMessage.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ScrollableMessage.java
index 2fae92ec5..2fae92ec5 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ScrollableMessage.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ScrollableMessage.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ScrollableMessageResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ScrollableMessageResponse.java
index 880c27f95..880c27f95 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ScrollableMessageResponse.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ScrollableMessageResponse.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SdlMsgVersion.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SdlMsgVersion.java
index cb5df057d..cb5df057d 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SdlMsgVersion.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SdlMsgVersion.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SendLocation.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SendLocation.java
index 2a9108e47..2a9108e47 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SendLocation.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SendLocation.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SendLocationResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SendLocationResponse.java
index dcee04e9a..dcee04e9a 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SendLocationResponse.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SendLocationResponse.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SetAppIcon.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetAppIcon.java
index 2cb5aef31..2cb5aef31 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SetAppIcon.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetAppIcon.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SetAppIconResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetAppIconResponse.java
index c6d0f7ddf..c6d0f7ddf 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SetAppIconResponse.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetAppIconResponse.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SetDisplayLayout.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetDisplayLayout.java
index 2a3fd9d4b..2a3fd9d4b 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SetDisplayLayout.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetDisplayLayout.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SetDisplayLayoutResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetDisplayLayoutResponse.java
index b9947a4ac..b9947a4ac 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SetDisplayLayoutResponse.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetDisplayLayoutResponse.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SetGlobalProperties.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetGlobalProperties.java
index 7f597cafe..7f597cafe 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SetGlobalProperties.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetGlobalProperties.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SetGlobalPropertiesResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetGlobalPropertiesResponse.java
index f33bc0b7c..f33bc0b7c 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SetGlobalPropertiesResponse.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetGlobalPropertiesResponse.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SetMediaClockTimer.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetMediaClockTimer.java
index bd6bac324..bd6bac324 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SetMediaClockTimer.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetMediaClockTimer.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SetMediaClockTimerResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetMediaClockTimerResponse.java
index e74ecc1b9..e74ecc1b9 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SetMediaClockTimerResponse.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetMediaClockTimerResponse.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/Show.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Show.java
index 24307c9de..24307c9de 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/Show.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Show.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ShowConstantTbt.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ShowConstantTbt.java
index f65e1a100..f65e1a100 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ShowConstantTbt.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ShowConstantTbt.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ShowConstantTbtResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ShowConstantTbtResponse.java
index a3e2dbaf1..a3e2dbaf1 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ShowConstantTbtResponse.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ShowConstantTbtResponse.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ShowResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ShowResponse.java
index 54ff95033..54ff95033 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ShowResponse.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ShowResponse.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SingleTireStatus.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SingleTireStatus.java
index ab30ff365..ab30ff365 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SingleTireStatus.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SingleTireStatus.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/Slider.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Slider.java
index 16da80dcb..16da80dcb 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/Slider.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Slider.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SliderResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SliderResponse.java
index 0d8487d12..0d8487d12 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SliderResponse.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SliderResponse.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SoftButton.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SoftButton.java
index e010a08da..e010a08da 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SoftButton.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SoftButton.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SoftButtonCapabilities.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SoftButtonCapabilities.java
index e2849086c..e2849086c 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SoftButtonCapabilities.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SoftButtonCapabilities.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/Speak.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Speak.java
index b5e775f06..b5e775f06 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/Speak.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Speak.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SpeakResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SpeakResponse.java
index 740d24776..740d24776 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SpeakResponse.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SpeakResponse.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/StartTime.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/StartTime.java
index bce0b9fc1..bce0b9fc1 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/StartTime.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/StartTime.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/StreamRPCResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/StreamRPCResponse.java
index bd75bef6d..bd75bef6d 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/StreamRPCResponse.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/StreamRPCResponse.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SubscribeButton.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeButton.java
index 7f1f92bae..7f1f92bae 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SubscribeButton.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeButton.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SubscribeButtonResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeButtonResponse.java
index 81fca78c2..81fca78c2 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SubscribeButtonResponse.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeButtonResponse.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SubscribeVehicleData.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleData.java
index 6b934ef21..6b934ef21 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SubscribeVehicleData.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleData.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SubscribeVehicleDataResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleDataResponse.java
index f8092cae8..f8092cae8 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SubscribeVehicleDataResponse.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleDataResponse.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SubscribeWayPoints.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeWayPoints.java
index e0d3627e2..e0d3627e2 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SubscribeWayPoints.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeWayPoints.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SubscribeWayPointsResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeWayPointsResponse.java
index 880a97229..880a97229 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SubscribeWayPointsResponse.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeWayPointsResponse.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SystemRequest.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SystemRequest.java
index 14164b964..14164b964 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SystemRequest.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SystemRequest.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SystemRequestResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SystemRequestResponse.java
index 6fc920f1e..6fc920f1e 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/SystemRequestResponse.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SystemRequestResponse.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/TTSChunk.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TTSChunk.java
index 97f865903..97f865903 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/TTSChunk.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TTSChunk.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/TextField.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TextField.java
index 918f0eb2f..918f0eb2f 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/TextField.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TextField.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/TireStatus.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TireStatus.java
index f853d673c..f853d673c 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/TireStatus.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TireStatus.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/TouchCoord.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TouchCoord.java
index 95f793fe6..95f793fe6 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/TouchCoord.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TouchCoord.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/TouchEvent.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TouchEvent.java
index 76e3c4207..76e3c4207 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/TouchEvent.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TouchEvent.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/TouchEventCapabilities.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TouchEventCapabilities.java
index b67e5b61a..b67e5b61a 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/TouchEventCapabilities.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TouchEventCapabilities.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/Turn.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Turn.java
index 437e176a5..437e176a5 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/Turn.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Turn.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/UnregisterAppInterface.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnregisterAppInterface.java
index 8db9e032f..8db9e032f 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/UnregisterAppInterface.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnregisterAppInterface.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/UnregisterAppInterfaceResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnregisterAppInterfaceResponse.java
index d77bf3b39..d77bf3b39 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/UnregisterAppInterfaceResponse.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnregisterAppInterfaceResponse.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/UnsubscribeButton.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeButton.java
index 33567a8af..33567a8af 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/UnsubscribeButton.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeButton.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/UnsubscribeButtonResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeButtonResponse.java
index 7efc00955..7efc00955 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/UnsubscribeButtonResponse.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeButtonResponse.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleData.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleData.java
index 668b31fd9..668b31fd9 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleData.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleData.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleDataResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleDataResponse.java
index 92d9a46df..92d9a46df 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleDataResponse.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleDataResponse.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/UnsubscribeWayPoints.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeWayPoints.java
index b748ef673..b748ef673 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/UnsubscribeWayPoints.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeWayPoints.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/UnsubscribeWayPointsResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeWayPointsResponse.java
index 8804892aa..8804892aa 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/UnsubscribeWayPointsResponse.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeWayPointsResponse.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/UpdateTurnList.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UpdateTurnList.java
index ad2b41163..ad2b41163 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/UpdateTurnList.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UpdateTurnList.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/UpdateTurnListResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UpdateTurnListResponse.java
index add51c5a5..add51c5a5 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/UpdateTurnListResponse.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UpdateTurnListResponse.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/VehicleDataResult.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VehicleDataResult.java
index ef466d727..ef466d727 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/VehicleDataResult.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VehicleDataResult.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/VehicleType.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VehicleType.java
index 3f30774c4..3f30774c4 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/VehicleType.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VehicleType.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/VrHelpItem.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VrHelpItem.java
index f195b4cae..f195b4cae 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/VrHelpItem.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VrHelpItem.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/AmbientLightStatus.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AmbientLightStatus.java
index 3f4076b11..3f4076b11 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/AmbientLightStatus.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AmbientLightStatus.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/AppHMIType.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AppHMIType.java
index a6aed67d9..a6aed67d9 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/AppHMIType.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AppHMIType.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/AppInterfaceUnregisteredReason.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AppInterfaceUnregisteredReason.java
index d4a7ff103..d4a7ff103 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/AppInterfaceUnregisteredReason.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AppInterfaceUnregisteredReason.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/AudioStreamingState.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AudioStreamingState.java
index 50accb6bf..50accb6bf 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/AudioStreamingState.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AudioStreamingState.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/AudioType.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AudioType.java
index d340e0e4c..d340e0e4c 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/AudioType.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AudioType.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/BitsPerSample.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/BitsPerSample.java
index b21e138a9..b21e138a9 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/BitsPerSample.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/BitsPerSample.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/ButtonEventMode.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ButtonEventMode.java
index 33f1f0f49..33f1f0f49 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/ButtonEventMode.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ButtonEventMode.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/ButtonName.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ButtonName.java
index 1391a9d44..1391a9d44 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/ButtonName.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ButtonName.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/ButtonPressMode.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ButtonPressMode.java
index cc2852526..cc2852526 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/ButtonPressMode.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ButtonPressMode.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/CarModeStatus.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/CarModeStatus.java
index c44b457ec..c44b457ec 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/CarModeStatus.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/CarModeStatus.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/CharacterSet.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/CharacterSet.java
index b8c4c9535..b8c4c9535 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/CharacterSet.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/CharacterSet.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/CompassDirection.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/CompassDirection.java
index a450bf6ed..a450bf6ed 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/CompassDirection.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/CompassDirection.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/ComponentVolumeStatus.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ComponentVolumeStatus.java
index 64d5515ad..64d5515ad 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/ComponentVolumeStatus.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ComponentVolumeStatus.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/DeliveryMode.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/DeliveryMode.java
index 52361a97d..52361a97d 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/DeliveryMode.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/DeliveryMode.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/DeviceLevelStatus.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/DeviceLevelStatus.java
index 273dc83d3..273dc83d3 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/DeviceLevelStatus.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/DeviceLevelStatus.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/Dimension.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/Dimension.java
index 012803510..012803510 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/Dimension.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/Dimension.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/DisplayType.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/DisplayType.java
index 2a2996762..2a2996762 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/DisplayType.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/DisplayType.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/DriverDistractionState.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/DriverDistractionState.java
index 890488c5e..890488c5e 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/DriverDistractionState.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/DriverDistractionState.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/ECallConfirmationStatus.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ECallConfirmationStatus.java
index b7a341d9e..b7a341d9e 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/ECallConfirmationStatus.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ECallConfirmationStatus.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/EmergencyEventType.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/EmergencyEventType.java
index 374a6c7e2..374a6c7e2 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/EmergencyEventType.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/EmergencyEventType.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/FileType.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/FileType.java
index 54e5ce8b8..54e5ce8b8 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/FileType.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/FileType.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/FuelCutoffStatus.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/FuelCutoffStatus.java
index 266f13afb..266f13afb 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/FuelCutoffStatus.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/FuelCutoffStatus.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/GlobalProperty.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/GlobalProperty.java
index a54d53d1d..a54d53d1d 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/GlobalProperty.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/GlobalProperty.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/HMILevel.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/HMILevel.java
index 8757a26ec..8757a26ec 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/HMILevel.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/HMILevel.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/HmiZoneCapabilities.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/HmiZoneCapabilities.java
index 4725b4ff4..4725b4ff4 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/HmiZoneCapabilities.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/HmiZoneCapabilities.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/IgnitionStableStatus.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/IgnitionStableStatus.java
index 91d6ecf8e..91d6ecf8e 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/IgnitionStableStatus.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/IgnitionStableStatus.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/IgnitionStatus.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/IgnitionStatus.java
index b17ccf1cf..b17ccf1cf 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/IgnitionStatus.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/IgnitionStatus.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/ImageFieldName.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ImageFieldName.java
index bf92ef5f4..bf92ef5f4 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/ImageFieldName.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ImageFieldName.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/ImageType.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ImageType.java
index 5b79257e1..5b79257e1 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/ImageType.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ImageType.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/InteractionMode.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/InteractionMode.java
index 98b61a1f2..98b61a1f2 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/InteractionMode.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/InteractionMode.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/Jingle.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/Jingle.java
index 85a1e8e67..85a1e8e67 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/Jingle.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/Jingle.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/KeyboardEvent.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/KeyboardEvent.java
index 7a730377d..7a730377d 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/KeyboardEvent.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/KeyboardEvent.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/KeyboardLayout.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/KeyboardLayout.java
index 2cd71b3f3..2cd71b3f3 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/KeyboardLayout.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/KeyboardLayout.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/KeypressMode.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/KeypressMode.java
index 32e198585..32e198585 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/KeypressMode.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/KeypressMode.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/Language.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/Language.java
index 5f0a0b88f..5f0a0b88f 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/Language.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/Language.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/LayoutMode.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/LayoutMode.java
index b64cf1bb3..b64cf1bb3 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/LayoutMode.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/LayoutMode.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/LockScreenStatus.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/LockScreenStatus.java
index ba25a3024..ba25a3024 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/LockScreenStatus.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/LockScreenStatus.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/MediaClockFormat.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/MediaClockFormat.java
index 2bf84744a..2bf84744a 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/MediaClockFormat.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/MediaClockFormat.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/PRNDL.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/PRNDL.java
index 965ebb8b4..965ebb8b4 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/PRNDL.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/PRNDL.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/PowerModeQualificationStatus.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/PowerModeQualificationStatus.java
index c268e14aa..c268e14aa 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/PowerModeQualificationStatus.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/PowerModeQualificationStatus.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/PowerModeStatus.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/PowerModeStatus.java
index 06ed3ba9a..06ed3ba9a 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/PowerModeStatus.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/PowerModeStatus.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/PrerecordedSpeech.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/PrerecordedSpeech.java
index 2b27040a6..2b27040a6 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/PrerecordedSpeech.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/PrerecordedSpeech.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/PrimaryAudioSource.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/PrimaryAudioSource.java
index b06045d1a..b06045d1a 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/PrimaryAudioSource.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/PrimaryAudioSource.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/RequestType.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/RequestType.java
index 0ddcfef3a..0ddcfef3a 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/RequestType.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/RequestType.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/Result.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/Result.java
index 870e4115e..870e4115e 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/Result.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/Result.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/SamplingRate.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SamplingRate.java
index e659ff165..e659ff165 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/SamplingRate.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SamplingRate.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/SdlConnectionState.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SdlConnectionState.java
index fa2caecb6..fa2caecb6 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/SdlConnectionState.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SdlConnectionState.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/SdlDisconnectedReason.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SdlDisconnectedReason.java
index 0d1902e3a..0d1902e3a 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/SdlDisconnectedReason.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SdlDisconnectedReason.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/SdlInterfaceAvailability.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SdlInterfaceAvailability.java
index 0f6b2530c..0f6b2530c 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/SdlInterfaceAvailability.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SdlInterfaceAvailability.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/SoftButtonType.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SoftButtonType.java
index 29fa27020..29fa27020 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/SoftButtonType.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SoftButtonType.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/SpeechCapabilities.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SpeechCapabilities.java
index 2b5d17740..2b5d17740 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/SpeechCapabilities.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SpeechCapabilities.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/SystemAction.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SystemAction.java
index 835e9b1b9..835e9b1b9 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/SystemAction.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SystemAction.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/SystemContext.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SystemContext.java
index 1ea9d60b1..1ea9d60b1 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/SystemContext.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SystemContext.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/TBTState.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TBTState.java
index d334ccad7..d334ccad7 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/TBTState.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TBTState.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/TextAlignment.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TextAlignment.java
index b188d6ba8..b188d6ba8 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/TextAlignment.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TextAlignment.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/TextFieldName.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TextFieldName.java
index ded9d0571..ded9d0571 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/TextFieldName.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TextFieldName.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/TouchType.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TouchType.java
index 952904915..952904915 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/TouchType.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TouchType.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/TriggerSource.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TriggerSource.java
index 169721705..169721705 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/TriggerSource.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/TriggerSource.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/UpdateMode.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/UpdateMode.java
index cd9bf6dfe..cd9bf6dfe 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/UpdateMode.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/UpdateMode.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/VehicleDataEventStatus.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataEventStatus.java
index 64a5dd898..64a5dd898 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/VehicleDataEventStatus.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataEventStatus.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/VehicleDataNotificationStatus.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataNotificationStatus.java
index d7bca9fc7..d7bca9fc7 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/VehicleDataNotificationStatus.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataNotificationStatus.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/VehicleDataResultCode.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataResultCode.java
index 45c2e7c11..45c2e7c11 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/VehicleDataResultCode.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataResultCode.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/VehicleDataStatus.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataStatus.java
index 2245bbe71..2245bbe71 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/VehicleDataStatus.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataStatus.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/VehicleDataType.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataType.java
index adebca268..adebca268 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/VehicleDataType.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataType.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/VrCapabilities.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VrCapabilities.java
index e228638ce..e228638ce 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/VrCapabilities.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VrCapabilities.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/WarningLightStatus.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/WarningLightStatus.java
index 3d002e651..3d002e651 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/WarningLightStatus.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/WarningLightStatus.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/WayPointType.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/WayPointType.java
index 120facaef..120facaef 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/WayPointType.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/WayPointType.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/WiperStatus.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/WiperStatus.java
index 546cf05b5..546cf05b5 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/enums/WiperStatus.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/WiperStatus.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/listeners/OnPutFileUpdateListener.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnPutFileUpdateListener.java
index 1a8e4f35f..1a8e4f35f 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/listeners/OnPutFileUpdateListener.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnPutFileUpdateListener.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/listeners/OnRPCNotificationListener.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCNotificationListener.java
index e760618b1..e760618b1 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/listeners/OnRPCNotificationListener.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCNotificationListener.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/listeners/OnRPCResponseListener.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCResponseListener.java
index 4bc5ccd79..4bc5ccd79 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/listeners/OnRPCResponseListener.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCResponseListener.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/security/ISecurityInitializedListener.java b/sdl_android/src/main/java/com/smartdevicelink/security/ISecurityInitializedListener.java
index f18152ed0..f18152ed0 100644
--- a/sdl_android_lib/src/com/smartdevicelink/security/ISecurityInitializedListener.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/security/ISecurityInitializedListener.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/security/SdlSecurityBase.java b/sdl_android/src/main/java/com/smartdevicelink/security/SdlSecurityBase.java
index 8b7e6a12a..8b7e6a12a 100644
--- a/sdl_android_lib/src/com/smartdevicelink/security/SdlSecurityBase.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/security/SdlSecurityBase.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/streaming/AbstractPacketizer.java b/sdl_android/src/main/java/com/smartdevicelink/streaming/AbstractPacketizer.java
index 81dbdd0b0..81dbdd0b0 100644
--- a/sdl_android_lib/src/com/smartdevicelink/streaming/AbstractPacketizer.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/streaming/AbstractPacketizer.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/streaming/IStreamListener.java b/sdl_android/src/main/java/com/smartdevicelink/streaming/IStreamListener.java
index 2e19cf578..2e19cf578 100644
--- a/sdl_android_lib/src/com/smartdevicelink/streaming/IStreamListener.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/streaming/IStreamListener.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/streaming/StreamPacketizer.java b/sdl_android/src/main/java/com/smartdevicelink/streaming/StreamPacketizer.java
index 525d94739..525d94739 100644
--- a/sdl_android_lib/src/com/smartdevicelink/streaming/StreamPacketizer.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/streaming/StreamPacketizer.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/streaming/StreamRPCPacketizer.java b/sdl_android/src/main/java/com/smartdevicelink/streaming/StreamRPCPacketizer.java
index 5652aafc3..5652aafc3 100644
--- a/sdl_android_lib/src/com/smartdevicelink/streaming/StreamRPCPacketizer.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/streaming/StreamRPCPacketizer.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/trace/DiagLevel.java b/sdl_android/src/main/java/com/smartdevicelink/trace/DiagLevel.java
index b77b34486..b77b34486 100644
--- a/sdl_android_lib/src/com/smartdevicelink/trace/DiagLevel.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/trace/DiagLevel.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/trace/ISTListener.java b/sdl_android/src/main/java/com/smartdevicelink/trace/ISTListener.java
index 3af7d5020..3af7d5020 100644
--- a/sdl_android_lib/src/com/smartdevicelink/trace/ISTListener.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/trace/ISTListener.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/trace/Mime.java b/sdl_android/src/main/java/com/smartdevicelink/trace/Mime.java
index 026f31721..026f31721 100644
--- a/sdl_android_lib/src/com/smartdevicelink/trace/Mime.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/trace/Mime.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/trace/OpenRPCMessage.java b/sdl_android/src/main/java/com/smartdevicelink/trace/OpenRPCMessage.java
index 35a8de749..35a8de749 100644
--- a/sdl_android_lib/src/com/smartdevicelink/trace/OpenRPCMessage.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/trace/OpenRPCMessage.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/trace/SdlTrace.java b/sdl_android/src/main/java/com/smartdevicelink/trace/SdlTrace.java
index 2d997b1c4..2d997b1c4 100644
--- a/sdl_android_lib/src/com/smartdevicelink/trace/SdlTrace.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/trace/SdlTrace.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/trace/TraceDeviceInfo.java b/sdl_android/src/main/java/com/smartdevicelink/trace/TraceDeviceInfo.java
index 83c612d76..83c612d76 100644
--- a/sdl_android_lib/src/com/smartdevicelink/trace/TraceDeviceInfo.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/trace/TraceDeviceInfo.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/trace/enums/DetailLevel.java b/sdl_android/src/main/java/com/smartdevicelink/trace/enums/DetailLevel.java
index bd213679d..bd213679d 100644
--- a/sdl_android_lib/src/com/smartdevicelink/trace/enums/DetailLevel.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/trace/enums/DetailLevel.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/trace/enums/InterfaceActivityDirection.java b/sdl_android/src/main/java/com/smartdevicelink/trace/enums/InterfaceActivityDirection.java
index 0865d2e32..0865d2e32 100644
--- a/sdl_android_lib/src/com/smartdevicelink/trace/enums/InterfaceActivityDirection.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/trace/enums/InterfaceActivityDirection.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/trace/enums/Mod.java b/sdl_android/src/main/java/com/smartdevicelink/trace/enums/Mod.java
index b363473b2..b363473b2 100644
--- a/sdl_android_lib/src/com/smartdevicelink/trace/enums/Mod.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/trace/enums/Mod.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/transport/BTTransport.java b/sdl_android/src/main/java/com/smartdevicelink/transport/BTTransport.java
index 526d2226d..526d2226d 100644
--- a/sdl_android_lib/src/com/smartdevicelink/transport/BTTransport.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/transport/BTTransport.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/transport/BTTransportConfig.java b/sdl_android/src/main/java/com/smartdevicelink/transport/BTTransportConfig.java
index 5de6022b2..5de6022b2 100644
--- a/sdl_android_lib/src/com/smartdevicelink/transport/BTTransportConfig.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/transport/BTTransportConfig.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/transport/BaseTransportConfig.java b/sdl_android/src/main/java/com/smartdevicelink/transport/BaseTransportConfig.java
index 4b7fe79be..4b7fe79be 100644
--- a/sdl_android_lib/src/com/smartdevicelink/transport/BaseTransportConfig.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/transport/BaseTransportConfig.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/transport/ITransportListener.java b/sdl_android/src/main/java/com/smartdevicelink/transport/ITransportListener.java
index b4c4a9b33..b4c4a9b33 100644
--- a/sdl_android_lib/src/com/smartdevicelink/transport/ITransportListener.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/transport/ITransportListener.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/transport/MultiplexBluetoothTransport.java b/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexBluetoothTransport.java
index b4fea0e71..b4fea0e71 100644
--- a/sdl_android_lib/src/com/smartdevicelink/transport/MultiplexBluetoothTransport.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexBluetoothTransport.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/transport/MultiplexTransport.java b/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexTransport.java
index ecb8281cc..ecb8281cc 100644
--- a/sdl_android_lib/src/com/smartdevicelink/transport/MultiplexTransport.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexTransport.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/transport/MultiplexTransportConfig.java b/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexTransportConfig.java
index 82fadbee2..82fadbee2 100644
--- a/sdl_android_lib/src/com/smartdevicelink/transport/MultiplexTransportConfig.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexTransportConfig.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/transport/RouterServiceValidator.java b/sdl_android/src/main/java/com/smartdevicelink/transport/RouterServiceValidator.java
index 6703232d5..6703232d5 100644
--- a/sdl_android_lib/src/com/smartdevicelink/transport/RouterServiceValidator.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/transport/RouterServiceValidator.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/transport/SdlBroadcastReceiver.java b/sdl_android/src/main/java/com/smartdevicelink/transport/SdlBroadcastReceiver.java
index 6a5cda6b7..6a5cda6b7 100644
--- a/sdl_android_lib/src/com/smartdevicelink/transport/SdlBroadcastReceiver.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/transport/SdlBroadcastReceiver.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/transport/SdlPsm.java b/sdl_android/src/main/java/com/smartdevicelink/transport/SdlPsm.java
index ed86cbb69..ed86cbb69 100644
--- a/sdl_android_lib/src/com/smartdevicelink/transport/SdlPsm.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/transport/SdlPsm.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/transport/SdlRouterService.java b/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java
index 37d11deb5..37d11deb5 100644
--- a/sdl_android_lib/src/com/smartdevicelink/transport/SdlRouterService.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/transport/SdlRouterStatusProvider.java b/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterStatusProvider.java
index 916b414d3..916b414d3 100644
--- a/sdl_android_lib/src/com/smartdevicelink/transport/SdlRouterStatusProvider.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterStatusProvider.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/transport/SdlTransport.java b/sdl_android/src/main/java/com/smartdevicelink/transport/SdlTransport.java
index 27c87bcef..27c87bcef 100644
--- a/sdl_android_lib/src/com/smartdevicelink/transport/SdlTransport.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/transport/SdlTransport.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/transport/SiphonServer.java b/sdl_android/src/main/java/com/smartdevicelink/transport/SiphonServer.java
index ab8a8a7bd..ab8a8a7bd 100644
--- a/sdl_android_lib/src/com/smartdevicelink/transport/SiphonServer.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/transport/SiphonServer.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/transport/TCPTransport.java b/sdl_android/src/main/java/com/smartdevicelink/transport/TCPTransport.java
index e9fb0efcf..e9fb0efcf 100644
--- a/sdl_android_lib/src/com/smartdevicelink/transport/TCPTransport.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/transport/TCPTransport.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/transport/TCPTransportConfig.java b/sdl_android/src/main/java/com/smartdevicelink/transport/TCPTransportConfig.java
index 8ff3f2172..8ff3f2172 100644
--- a/sdl_android_lib/src/com/smartdevicelink/transport/TCPTransportConfig.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/transport/TCPTransportConfig.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/transport/TransportBroker.java b/sdl_android/src/main/java/com/smartdevicelink/transport/TransportBroker.java
index 89187d524..89187d524 100644
--- a/sdl_android_lib/src/com/smartdevicelink/transport/TransportBroker.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/transport/TransportBroker.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/transport/TransportConstants.java b/sdl_android/src/main/java/com/smartdevicelink/transport/TransportConstants.java
index 29cdea035..29cdea035 100644
--- a/sdl_android_lib/src/com/smartdevicelink/transport/TransportConstants.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/transport/TransportConstants.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/transport/USBAccessoryAttachmentActivity.java b/sdl_android/src/main/java/com/smartdevicelink/transport/USBAccessoryAttachmentActivity.java
index fe23a1e7b..fe23a1e7b 100644
--- a/sdl_android_lib/src/com/smartdevicelink/transport/USBAccessoryAttachmentActivity.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/transport/USBAccessoryAttachmentActivity.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/transport/USBTransport.java b/sdl_android/src/main/java/com/smartdevicelink/transport/USBTransport.java
index 6ab4ed59c..6ab4ed59c 100644
--- a/sdl_android_lib/src/com/smartdevicelink/transport/USBTransport.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/transport/USBTransport.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/transport/USBTransportConfig.java b/sdl_android/src/main/java/com/smartdevicelink/transport/USBTransportConfig.java
index 4e82807cb..4e82807cb 100644
--- a/sdl_android_lib/src/com/smartdevicelink/transport/USBTransportConfig.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/transport/USBTransportConfig.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/transport/enums/TransportType.java b/sdl_android/src/main/java/com/smartdevicelink/transport/enums/TransportType.java
index ac4a75b7d..ac4a75b7d 100644
--- a/sdl_android_lib/src/com/smartdevicelink/transport/enums/TransportType.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/transport/enums/TransportType.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/transport/utl/ByteAraryMessageAssembler.java b/sdl_android/src/main/java/com/smartdevicelink/transport/utl/ByteAraryMessageAssembler.java
index 98b8b666e..98b8b666e 100644
--- a/sdl_android_lib/src/com/smartdevicelink/transport/utl/ByteAraryMessageAssembler.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/transport/utl/ByteAraryMessageAssembler.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/transport/utl/ByteArrayMessageSpliter.java b/sdl_android/src/main/java/com/smartdevicelink/transport/utl/ByteArrayMessageSpliter.java
index 6957d2b8a..6957d2b8a 100644
--- a/sdl_android_lib/src/com/smartdevicelink/transport/utl/ByteArrayMessageSpliter.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/transport/utl/ByteArrayMessageSpliter.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/util/AndroidTools.java b/sdl_android/src/main/java/com/smartdevicelink/util/AndroidTools.java
index ff8819ec3..ff8819ec3 100644
--- a/sdl_android_lib/src/com/smartdevicelink/util/AndroidTools.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/util/AndroidTools.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/util/BitConverter.java b/sdl_android/src/main/java/com/smartdevicelink/util/BitConverter.java
index c844e49a4..c844e49a4 100644
--- a/sdl_android_lib/src/com/smartdevicelink/util/BitConverter.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/util/BitConverter.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/util/ByteEnumer.java b/sdl_android/src/main/java/com/smartdevicelink/util/ByteEnumer.java
index 0b67d9992..0b67d9992 100644
--- a/sdl_android_lib/src/com/smartdevicelink/util/ByteEnumer.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/util/ByteEnumer.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/util/CorrelationIdGenerator.java b/sdl_android/src/main/java/com/smartdevicelink/util/CorrelationIdGenerator.java
index 18ff93622..18ff93622 100644
--- a/sdl_android_lib/src/com/smartdevicelink/util/CorrelationIdGenerator.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/util/CorrelationIdGenerator.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/util/DebugTool.java b/sdl_android/src/main/java/com/smartdevicelink/util/DebugTool.java
index 2ea9cc938..2ea9cc938 100644
--- a/sdl_android_lib/src/com/smartdevicelink/util/DebugTool.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/util/DebugTool.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/util/HttpRequestTask.java b/sdl_android/src/main/java/com/smartdevicelink/util/HttpRequestTask.java
index 5e8bba95c..5e8bba95c 100644
--- a/sdl_android_lib/src/com/smartdevicelink/util/HttpRequestTask.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/util/HttpRequestTask.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/util/HttpUtils.java b/sdl_android/src/main/java/com/smartdevicelink/util/HttpUtils.java
index d0752e008..d0752e008 100644
--- a/sdl_android_lib/src/com/smartdevicelink/util/HttpUtils.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/util/HttpUtils.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/util/IConsole.java b/sdl_android/src/main/java/com/smartdevicelink/util/IConsole.java
index 8d6d4a0f1..8d6d4a0f1 100644
--- a/sdl_android_lib/src/com/smartdevicelink/util/IConsole.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/util/IConsole.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/util/NativeLogTool.java b/sdl_android/src/main/java/com/smartdevicelink/util/NativeLogTool.java
index c89b970dc..c89b970dc 100644
--- a/sdl_android_lib/src/com/smartdevicelink/util/NativeLogTool.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/util/NativeLogTool.java
diff --git a/sdl_android_lib/src/com/smartdevicelink/util/SdlDataTypeConverter.java b/sdl_android/src/main/java/com/smartdevicelink/util/SdlDataTypeConverter.java
index 0b47a59cd..0b47a59cd 100644
--- a/sdl_android_lib/src/com/smartdevicelink/util/SdlDataTypeConverter.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/util/SdlDataTypeConverter.java