Merge branch 'feature/issue_782_Android_Managers' of https://github.com/smartdevicelink/sdl_android into feature/issue_782_video_streaming_managerfeature/issue_782_video_streaming_manager

# Conflicts:
#	sdl_android/src/main/java/com/smartdevicelink/api/SdlManager.java
#	sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java

72 files changed, 3855 insertions, 596 deletions

diff --git a/sdl_android/src/androidTest/assets/json/GetVehicleData.json b/sdl_android/src/androidTest/assets/json/GetVehicleData.json
index 264329c6a..81b25ef87 100644
--- a/sdl_android/src/androidTest/assets/json/GetVehicleData.json
+++ b/sdl_android/src/androidTest/assets/json/GetVehicleData.json
@@ -30,7 +30,8 @@
       "clusterModeStatus":true,
       "myKey":true,
       "fuelRange":true,
-      "turnSignal":true
+      "turnSignal":true,
+      "electronicParkBrakeStatus":true
     }
   },
   "response":{
@@ -157,6 +158,7 @@
       "myKey":{
         "e911Override":"NO_DATA_EXISTS"
       },
+      "electronicParkBrakeStatus":"CLOSED",
       "fuelRange":[
         {
           "type":"GASOLINE",
diff --git a/sdl_android/src/androidTest/assets/json/SetMediaClockTimer.json b/sdl_android/src/androidTest/assets/json/SetMediaClockTimer.json
index af1671200..e4950d05d 100644
--- a/sdl_android/src/androidTest/assets/json/SetMediaClockTimer.json
+++ b/sdl_android/src/androidTest/assets/json/SetMediaClockTimer.json
@@ -13,7 +13,8 @@
         "seconds":19,
         "hours":12
       },
-      "updateMode":"COUNTDOWN"
+      "updateMode":"COUNTDOWN",
+      "audioStreamingIndicator":"PLAY"
     }
   },
   "response":{
diff --git a/sdl_android/src/androidTest/assets/json/SubscribeVehicleData.json b/sdl_android/src/androidTest/assets/json/SubscribeVehicleData.json
index 2639cb7ad..92cf00a1b 100644
--- a/sdl_android/src/androidTest/assets/json/SubscribeVehicleData.json
+++ b/sdl_android/src/androidTest/assets/json/SubscribeVehicleData.json
@@ -29,7 +29,8 @@
       "clusterModeStatus":true,
       "myKey":true,
       "fuelRange":true,
-      "turnSignal":true
+      "turnSignal":true,
+      "electronicParkBrakeStatus":true
     }
   },
   "response":{
@@ -143,6 +144,10 @@
       "turnSignal":{
         "dataType":"VEHICLEDATA_TURNSIGNAL",
         "resultCode":"IGNORED"
+      },
+      "electronicParkBrakeStatus":{
+        "dataType":"VEHICLEDATA_ELECTRONICPARKBRAKESTATUS",
+        "resultCode":"SUCCESS"
       }
     }
   }
diff --git a/sdl_android/src/androidTest/assets/json/UnsubscribeVehicleData.json b/sdl_android/src/androidTest/assets/json/UnsubscribeVehicleData.json
index 3303b7b56..d01b99aa8 100644
--- a/sdl_android/src/androidTest/assets/json/UnsubscribeVehicleData.json
+++ b/sdl_android/src/androidTest/assets/json/UnsubscribeVehicleData.json
@@ -29,7 +29,8 @@
       "clusterModeStatus":true,
       "myKey":true,
       "fuelRange":true,
-      "turnSignal":true
+      "turnSignal":true,
+      "electronicParkBrakeStatus":true
     }
   },
   "response":{
@@ -143,6 +144,10 @@
       "turnSignal":{
         "dataType":"VEHICLEDATA_TURNSIGNAL",
         "resultCode":"IGNORED"
+      },
+      "electronicParkBrakeStatus":{
+        "dataType":"VEHICLEDATA_ELECTRONICPARKBRAKESTATUS",
+        "resultCode":"SUCCESS"
       }
     }
   }
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/api/SdlManagerTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/api/SdlManagerTests.java
index 8100c6101..89dc0bdd2 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/api/SdlManagerTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/api/SdlManagerTests.java
@@ -85,14 +85,28 @@ public class SdlManagerTests extends AndroidTestCase {
 	private SdlManager createSampleManager(String appName, String appId){
 		SdlManager manager;
 
+		SdlManagerListener listener = new SdlManagerListener() {
+			@Override
+			public void onStart() {
+				listenerCalledCounter++;
+			}
+
+			@Override
+			public void onDestroy() {
+
+			}
+
+			@Override
+			public void onError(String info, Exception e) {
+
+			}
+		};
+
 		// build manager object - use all setters, will test using getters below
-		SdlManager.Builder builder = new SdlManager.Builder();
-		builder.setAppId(appId);
-		builder.setAppName(appName);
+		SdlManager.Builder builder = new SdlManager.Builder(getTestContext(),appId,appName,listener);
 		builder.setShortAppName(appName);
 		builder.setAppTypes(appType);
 		builder.setTransportType(transport);
-		builder.setContext(getTestContext());
 		builder.setLanguage(Language.EN_US);
 		builder.setDayColorScheme(templateColorScheme);
 		builder.setNightColorScheme(templateColorScheme);
@@ -145,13 +159,7 @@ public class SdlManagerTests extends AndroidTestCase {
 	public void testStartingManager(){
 		listenerCalledCounter = 0;
 
-		sdlManager.start(new CompletionListener() {
-			@Override
-			public void onComplete(boolean success) {
-				assertTrue(success);
-				listenerCalledCounter++;
-			}
-		});
+		sdlManager.start();
 
 		// Create and force all sub managers to be ready manually. Because SdlManager will not start until all sub managers are ready.
 		// Note : SdlManager.initialize() will not be called automatically by proxy as in real life because we have mock proxy not a real one
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/Test.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/Test.java
index 8272fbfee..99c0545a5 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/Test.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/Test.java
@@ -20,10 +20,12 @@ import com.smartdevicelink.proxy.rpc.ImageField;
 import com.smartdevicelink.proxy.rpc.ImageResolution;
 import com.smartdevicelink.proxy.rpc.KeyboardProperties;
 import com.smartdevicelink.proxy.rpc.LocationDetails;
+import com.smartdevicelink.proxy.rpc.MassageCushionFirmness;
+import com.smartdevicelink.proxy.rpc.MassageModeData;
 import com.smartdevicelink.proxy.rpc.MenuParams;
+import com.smartdevicelink.proxy.rpc.MetadataTags;
 import com.smartdevicelink.proxy.rpc.ModuleData;
 import com.smartdevicelink.proxy.rpc.NavigationCapability;
-import com.smartdevicelink.proxy.rpc.MetadataTags;
 import com.smartdevicelink.proxy.rpc.OasisAddress;
 import com.smartdevicelink.proxy.rpc.ParameterPermissions;
 import com.smartdevicelink.proxy.rpc.PermissionItem;
@@ -33,10 +35,13 @@ import com.smartdevicelink.proxy.rpc.RGBColor;
 import com.smartdevicelink.proxy.rpc.RadioControlCapabilities;
 import com.smartdevicelink.proxy.rpc.RadioControlData;
 import com.smartdevicelink.proxy.rpc.RdsData;
-import com.smartdevicelink.proxy.rpc.RemoteControlCapabilities;
 import com.smartdevicelink.proxy.rpc.Rectangle;
+import com.smartdevicelink.proxy.rpc.RemoteControlCapabilities;
 import com.smartdevicelink.proxy.rpc.ScreenParams;
 import com.smartdevicelink.proxy.rpc.SdlMsgVersion;
+import com.smartdevicelink.proxy.rpc.SeatControlCapabilities;
+import com.smartdevicelink.proxy.rpc.SeatControlData;
+import com.smartdevicelink.proxy.rpc.SeatMemoryAction;
 import com.smartdevicelink.proxy.rpc.SingleTireStatus;
 import com.smartdevicelink.proxy.rpc.SoftButton;
 import com.smartdevicelink.proxy.rpc.SoftButtonCapabilities;
@@ -58,6 +63,7 @@ import com.smartdevicelink.proxy.rpc.VrHelpItem;
 import com.smartdevicelink.proxy.rpc.enums.AmbientLightStatus;
 import com.smartdevicelink.proxy.rpc.enums.AppHMIType;
 import com.smartdevicelink.proxy.rpc.enums.AppInterfaceUnregisteredReason;
+import com.smartdevicelink.proxy.rpc.enums.AudioStreamingIndicator;
 import com.smartdevicelink.proxy.rpc.enums.AudioStreamingState;
 import com.smartdevicelink.proxy.rpc.enums.AudioType;
 import com.smartdevicelink.proxy.rpc.enums.BitsPerSample;
@@ -92,7 +98,11 @@ import com.smartdevicelink.proxy.rpc.enums.KeypressMode;
 import com.smartdevicelink.proxy.rpc.enums.Language;
 import com.smartdevicelink.proxy.rpc.enums.LayoutMode;
 import com.smartdevicelink.proxy.rpc.enums.LockScreenStatus;
+import com.smartdevicelink.proxy.rpc.enums.MassageCushion;
+import com.smartdevicelink.proxy.rpc.enums.MassageMode;
+import com.smartdevicelink.proxy.rpc.enums.MassageZone;
 import com.smartdevicelink.proxy.rpc.enums.MediaClockFormat;
+import com.smartdevicelink.proxy.rpc.enums.MetadataType;
 import com.smartdevicelink.proxy.rpc.enums.ModuleType;
 import com.smartdevicelink.proxy.rpc.enums.PowerModeQualificationStatus;
 import com.smartdevicelink.proxy.rpc.enums.PowerModeStatus;
@@ -103,8 +113,10 @@ import com.smartdevicelink.proxy.rpc.enums.RadioState;
 import com.smartdevicelink.proxy.rpc.enums.RequestType;
 import com.smartdevicelink.proxy.rpc.enums.Result;
 import com.smartdevicelink.proxy.rpc.enums.SamplingRate;
+import com.smartdevicelink.proxy.rpc.enums.SeatMemoryActionType;
 import com.smartdevicelink.proxy.rpc.enums.SoftButtonType;
 import com.smartdevicelink.proxy.rpc.enums.SpeechCapabilities;
+import com.smartdevicelink.proxy.rpc.enums.SupportedSeat;
 import com.smartdevicelink.proxy.rpc.enums.SystemAction;
 import com.smartdevicelink.proxy.rpc.enums.SystemCapabilityType;
 import com.smartdevicelink.proxy.rpc.enums.SystemContext;
@@ -113,7 +125,6 @@ import com.smartdevicelink.proxy.rpc.enums.TPMS;
 import com.smartdevicelink.proxy.rpc.enums.TemperatureUnit;
 import com.smartdevicelink.proxy.rpc.enums.TextAlignment;
 import com.smartdevicelink.proxy.rpc.enums.TextFieldName;
-import com.smartdevicelink.proxy.rpc.enums.MetadataType;
 import com.smartdevicelink.proxy.rpc.enums.TouchType;
 import com.smartdevicelink.proxy.rpc.enums.TriggerSource;
 import com.smartdevicelink.proxy.rpc.enums.UpdateMode;
@@ -140,7 +151,7 @@ import java.util.List;
 import java.util.Vector;
 
 public class Test {
-	
+
 	// Test Failure Messages
 	public static final String NULL      = "Value should be null.";
 	public static final String MATCH     = "Values should match.";
@@ -149,14 +160,14 @@ public class Test {
 	public static final String FALSE     = "Value should be false.";
 	public static final String NOT_NULL  = "Value should not be null.";
 	public static final String JSON_FAIL = "Json testing failed.";
-	
+
 	// RPC Request/Response/Notification/Datatype Test Values
 	public static final int                            GENERAL_INT                            = 100;
 	public static final Integer                        GENERAL_INTEGER                        = 100;
 	public static final Long                           GENERAL_LONG                           = 100L;
 	public static final Turn                           GENERAL_TURN                           = new Turn();
 	public static final Float                          GENERAL_FLOAT                          = 100f;
-	public static final Image                          GENERAL_IMAGE                          = new Image();	
+	public static final Image                          GENERAL_IMAGE                          = new Image();
 	public static final Choice                         GENERAL_CHOICE                         = new Choice();
 	public static final String                         GENERAL_STRING                         = "test";
 	public static final Double                         GENERAL_DOUBLE                         = 10.01;
@@ -187,9 +198,11 @@ public class Test {
 	public static final ButtonName                     GENERAL_BUTTONNAME                     = ButtonName.OK;
 	public static final UpdateMode                     GENERAL_UPDATEMODE                     = UpdateMode.RESUME;
 	public static final TouchCoord                     GENERAL_TOUCHCOORD                     = new TouchCoord();
+	public static final MassageModeData                GENERAL_MASSAGEMODEDATA                = new MassageModeData();
+	public static final MassageCushionFirmness         GENERAL_MASSAGECUSHIONFIRMNESS         = new MassageCushionFirmness();
 	public static final DisplayType                    GENERAL_DISPLAYTYPE                    = DisplayType.CID;
 	public static final VehicleType                    GENERAL_VEHICLETYPE                    = new VehicleType();
-	public static final RequestType                    GENERAL_REQUESTTYPE                    = RequestType.AUTH_REQUEST;	
+	public static final RequestType                    GENERAL_REQUESTTYPE                    = RequestType.AUTH_REQUEST;
 	public static final SystemAction                   GENERAL_SYSTEMACTION                   = SystemAction.DEFAULT_ACTION;
 	public static final CharacterSet                   GENERAL_CHARACTERSET                   = CharacterSet.CID1SET;
 	public static final SamplingRate                   GENERAL_SAMPLINGRATE                	  = SamplingRate._8KHZ;
@@ -205,6 +218,11 @@ public class Test {
 	public static final SdlMsgVersion                  GENERAL_SDLMSGVERSION                  = new SdlMsgVersion();
 	public static final PermissionItem                 GENERAL_PERMISSIONITEM                 = new PermissionItem();
 	public static final SoftButtonType                 GENERAL_SOFTBUTTONTYPE                 = SoftButtonType.SBT_BOTH;
+	public static final MassageZone                    GENERAL_MASSAGEZONE                    = MassageZone.LUMBAR;
+	public static final MassageMode                    GENERAL_MASSAGEMODE                    = MassageMode.HIGH;
+	public static final MassageCushion                 GENERAL_MASSAGECUSHION                 = MassageCushion.BACK_BOLSTERS;
+	public static final SeatMemoryActionType           GENERAL_SEATMEMORYACTIONTYPE           = SeatMemoryActionType.SAVE;
+	public static final SupportedSeat           	   GENERAL_SUPPORTEDSEAT                  = SupportedSeat.DRIVER;
 	public static final KeyboardLayout                 GENERAL_KEYBOARDLAYOUT                 = KeyboardLayout.QWERTY;
 	public static final ImageFieldName                 GENERAL_IMAGEFIELDNAME                 = ImageFieldName.graphic;
 	public static final HMIPermissions                 GENERAL_HMIPERMISSIONS                 = new HMIPermissions();
@@ -214,7 +232,7 @@ public class Test {
 	public static final PowerModeStatus                GENERAL_POWERMODESTATUS                = PowerModeStatus.RUNNING_2;
 	public static final VehicleDataType                GENERAL_VEHICLEDATATYPE                = VehicleDataType.VEHICLEDATA_BRAKING;
 	public static final InteractionMode                GENERAL_INTERACTIONMODE                = InteractionMode.BOTH;
-	public static final ImageResolution                GENERAL_IMAGERESOLUTION                = new ImageResolution();	
+	public static final ImageResolution                GENERAL_IMAGERESOLUTION                = new ImageResolution();
 	public static final FuelCutoffStatus               GENERAL_FUELCUTOFFSTATUS               = FuelCutoffStatus.NORMAL_OPERATION;
 	public static final CompassDirection               GENERAL_COMPASSDIRECTION               = CompassDirection.EAST;
 	public static final LockScreenStatus               GENERAL_LOCKSCREENSTATUS               = LockScreenStatus.REQUIRED;
@@ -222,24 +240,25 @@ public class Test {
 	public static final DeviceLevelStatus              GENERAL_DEVICELEVELSTATUS              = DeviceLevelStatus.FOUR_LEVEL_BARS;
 	public static final ButtonCapabilities             GENERAL_BUTTONCAPABILITIES             = new ButtonCapabilities();
 	public static final EmergencyEventType             GENERAL_EMERGENCYEVENTTYPE             = EmergencyEventType.FAULT;
-	public static final AmbientLightStatus             GENERAL_AMBIENTLIGHTSTATUS             = AmbientLightStatus.NIGHT; 
+	public static final AmbientLightStatus             GENERAL_AMBIENTLIGHTSTATUS             = AmbientLightStatus.NIGHT;
 	public static final SpeechCapabilities             GENERAL_SPEECHCAPABILITIES             = SpeechCapabilities.TEXT;
 	public static final WarningLightStatus        	   GENERAL_WARNINGLIGHTSTATUS        	  = WarningLightStatus.OFF;
-	public static final KeyboardProperties             GENERAL_KEYBOARDPROPERTIES             = new KeyboardProperties();	
+	public static final KeyboardProperties             GENERAL_KEYBOARDPROPERTIES             = new KeyboardProperties();
 	public static final PrimaryAudioSource             GENERAL_PRIMARYAUDIOSOURCE             = PrimaryAudioSource.BLUETOOTH_STEREO_BTST;
 	public static final AudioStreamingState            GENERAL_AUDIOSTREAMINGSTATE            = AudioStreamingState.AUDIBLE;
 	public static final VideoStreamingState            GENERAL_VIDEOSTREAMINGSTATE            = VideoStreamingState.STREAMABLE;
 	public static final DisplayCapabilities            GENERAL_DISPLAYCAPABILITIES            = new DisplayCapabilities();
-	public static final ParameterPermissions           GENERAL_PARAMETERPERMISSIONS           = new ParameterPermissions();  
-	public static final IgnitionStableStatus           GENERAL_IGNITIONSTABLESTATUS           = IgnitionStableStatus.IGNITION_SWITCH_STABLE;	
+	public static final ParameterPermissions           GENERAL_PARAMETERPERMISSIONS           = new ParameterPermissions();
+	public static final IgnitionStableStatus           GENERAL_IGNITIONSTABLESTATUS           = IgnitionStableStatus.IGNITION_SWITCH_STABLE;
 	public static final VehicleDataResultCode          GENERAL_VEHICLEDATARESULTCODE          = VehicleDataResultCode.IGNORED;
 	public static final ComponentVolumeStatus          GENERAL_COMPONENTVOLUMESTATUS          = ComponentVolumeStatus.LOW;
 	public static final PresetBankCapabilities         GENERAL_PRESETBANKCAPABILITIES         = new PresetBankCapabilities();
 	public static final VehicleDataEventStatus         GENERAL_VEHCILEDATAEVENTSTATUS         = VehicleDataEventStatus.YES;
 	public static final VehicleDataEventStatus         GENERAL_VEHICLEDATAEVENTSTATUS         = VehicleDataEventStatus.YES;
 	public static final TouchEventCapabilities         GENERAL_TOUCHEVENTCAPABILITIES         = new TouchEventCapabilities();
+	public static final SeatMemoryAction               GENERAL_SEATMEMORYACTION               = new SeatMemoryAction();
 	public static final SoftButtonCapabilities         GENERAL_SOFTBUTTONCAPABILITIES         = new SoftButtonCapabilities();
-	public static final ECallConfirmationStatus        GENERAL_ECALLCONFIRMATIONSTATUS        = ECallConfirmationStatus.CALL_IN_PROGRESS;	
+	public static final ECallConfirmationStatus        GENERAL_ECALLCONFIRMATIONSTATUS        = ECallConfirmationStatus.CALL_IN_PROGRESS;
 	public static final AudioPassThruCapabilities      GENERAL_AUDIOPASSTHRUCAPABILITIES      = new AudioPassThruCapabilities();
 	public static final PowerModeQualificationStatus   GENERAL_POWERMODEQUALIFICATIONSTATUS   = PowerModeQualificationStatus.POWER_MODE_OK;
 	public static final VehicleDataNotificationStatus  GENERAL_VEHICLEDATANOTIFICATIONSTATUS  = VehicleDataNotificationStatus.NORMAL;
@@ -261,6 +280,7 @@ public class Test {
 	public static final SingleTireStatus               GENERAL_SINGLETIRESTATUS               = new SingleTireStatus();
 	public static final DriverDistractionState         GENERAL_DRIVERDISTRACTIONSTATE         = DriverDistractionState.DD_ON;
 	public static final List<LocationDetails>          GENERAL_LOCATIONDETAILS_LIST           = Arrays.asList(new LocationDetails[] { Test.GENERAL_LOCATIONDETAILS, Test.GENERAL_LOCATIONDETAILS});
+	public static final AudioStreamingIndicator        GENERAL_AUDIO_STREAMING_INDICATOR      = AudioStreamingIndicator.PLAY;
 
 
 	public static final ModuleType 					   GENERAL_MODULETYPE           		  = ModuleType.CLIMATE;
@@ -270,12 +290,14 @@ public class Test {
 	public static final VentilationMode 			   GENERAL_VENTILATIONMODE                = VentilationMode.BOTH;
 	public static final RadioBand 				       GENERAL_RADIOBAND               	      = RadioBand.AM;
 	public static final ClimateControlData             GENERAL_CLIMATECONTROLDATA             = new ClimateControlData();
+	public static final SeatControlData                GENERAL_SEATCONTROLDATA                = new SeatControlData();
 	public static final RdsData                        GENERAL_RDSDATA                        = new RdsData();
 	public static final RadioState                     GENERAL_RADIOSTATE              	      = RadioState.ACQUIRED;
 	public static final RadioControlData               GENERAL_RADIOCONTROLDATA               = new RadioControlData();
 	public static final ModuleData 					   GENERAL_MODULEDATA                     = new ModuleData();
 	public static final ClimateControlCapabilities     GENERAL_CLIMATECONTROLCAPABILITIES     = new ClimateControlCapabilities();
 	public static final RadioControlCapabilities       GENERAL_RADIOCONTROLCAPABILITIES       = new RadioControlCapabilities();
+	public static final SeatControlCapabilities        GENERAL_SEATCONTROLCAPABILITIES        = new SeatControlCapabilities();
 
 	public static final HMICapabilities                GENERAL_HMICAPABILITIES                = new HMICapabilities();
 
@@ -295,6 +317,8 @@ public class Test {
 	public static final List<TextField>                 GENERAL_TEXTFIELD_LIST                 = new ArrayList<TextField>(1);
 	public static final List<DIDResult>                 GENERAL_DIDRESULT_LIST                 = new ArrayList<DIDResult>(1);
 	public static final List<TouchCoord>                GENERAL_TOUCHCOORD_LIST                = new ArrayList<TouchCoord>(1);
+	public static final List<MassageModeData>           GENERAL_MASSAGEMODEDATA_LIST           = new ArrayList<MassageModeData>(1);
+	public static final List<MassageCushionFirmness>    GENERAL_MASSAGECUSHIONFIRMNESS_LIST    = new ArrayList<MassageCushionFirmness>(1);
 	public static final List<AppHMIType>                GENERAL_APPHMITYPE_LIST                = new ArrayList<AppHMIType>(2);
 	public static final List<VrHelpItem>                GENERAL_VRHELPITEM_LIST                = new ArrayList<VrHelpItem>(2);
 	public static final List<SoftButton>                GENERAL_SOFTBUTTON_LIST                = new ArrayList<SoftButton>(1);
@@ -318,16 +342,17 @@ public class Test {
 	public static final List<RadioControlCapabilities>   GENERAL_RADIOCONTROLCAPABILITIES_LIST   = new ArrayList<RadioControlCapabilities>(1);
 	public static final Vector<String>                   GENERAL_VECTOR_STRING                   = new Vector<>(Arrays.asList(new String[] { "a", "b"}));
 	public static final Vector<TTSChunk>                 GENERAL_VECTOR_TTS_CHUNKS               = new Vector<>(Arrays.asList(TTSChunkFactory.createChunk(SpeechCapabilities.TEXT, "Welcome to the jungle")));
+	public static final List<SeatControlCapabilities>   GENERAL_SEATCONTROLCAPABILITIES_LIST   = new ArrayList<SeatControlCapabilities>(1);
 
 	public static final JSONArray  JSON_TURNS                     = new JSONArray();
-	public static final JSONArray  JSON_CHOICES                   = new JSONArray();		
+	public static final JSONArray  JSON_CHOICES                   = new JSONArray();
 	public static final JSONArray  JSON_HMILEVELS                 = new JSONArray();
 	public static final JSONArray  JSON_TTSCHUNKS                 = new JSONArray();
 	public static final JSONArray  JSON_DIDRESULTS                = new JSONArray();
 	public static final JSONArray  JSON_TEXTFIELDS                = new JSONArray();
 	public static final JSONArray  JSON_TOUCHCOORDS               = new JSONArray();
 	public static final JSONArray  JSON_VRHELPITEMS               = new JSONArray();
-	public static final JSONArray  JSON_SOFTBUTTONS               = new JSONArray();	
+	public static final JSONArray  JSON_SOFTBUTTONS               = new JSONArray();
 	public static final JSONArray  JSON_IMAGEFIELDS				  = new JSONArray();
 	public static final JSONArray  JSON_TOUCHEVENTS               = new JSONArray();
 	public static final JSONArray  JSON_PERMISSIONITEMS           = new JSONArray();
@@ -350,11 +375,11 @@ public class Test {
 	public static final JSONObject JSON_MENUPARAMS                = new JSONObject();
 	public static final JSONObject JSON_DEVICEINFO                = new JSONObject();
 	public static final JSONObject JSON_VRHELPITEM                = new JSONObject();
-	public static final JSONObject JSON_SCREENPARAMS              = new JSONObject();	
+	public static final JSONObject JSON_SCREENPARAMS              = new JSONObject();
 	public static final JSONObject JSON_SDLMSGVERSION             = new JSONObject();
 	public static final JSONObject JSON_PERMISSIONITEM            = new JSONObject();
 	public static final JSONObject JSON_HMIPERMISSIONS            = new JSONObject();
-	public static final JSONObject JSON_IMAGERESOLUTION           = new JSONObject();	
+	public static final JSONObject JSON_IMAGERESOLUTION           = new JSONObject();
 	public static final JSONObject JSON_KEYBOARDPROPERTIES        = new JSONObject();
 	public static final JSONObject JSON_DISPLAYCAPABILITIES       = new JSONObject();
 	public static final JSONObject JSON_PARAMETERPERMISSIONS      = new JSONObject();
@@ -369,7 +394,11 @@ public class Test {
 		GENERAL_TOUCHEVENTCAPABILITIES.setDoublePressAvailable(GENERAL_BOOLEAN);
 		GENERAL_TOUCHEVENTCAPABILITIES.setMultiTouchAvailable(GENERAL_BOOLEAN);
 		GENERAL_TOUCHEVENTCAPABILITIES.setPressAvailable(GENERAL_BOOLEAN);
-		
+
+		GENERAL_SEATMEMORYACTION.setAction(GENERAL_SEATMEMORYACTIONTYPE);
+		GENERAL_SEATMEMORYACTION.setLabel(GENERAL_STRING);
+		GENERAL_SEATMEMORYACTION.setId(GENERAL_INT);
+
 		GENERAL_IMAGERESOLUTION.setResolutionHeight(GENERAL_INT);
 		GENERAL_IMAGERESOLUTION.setResolutionWidth(GENERAL_INT);
 
@@ -387,6 +416,23 @@ public class Test {
 		GENERAL_CLIMATECONTROLDATA.setDefrostZone(GENERAL_DEFROSTZONE);
 		GENERAL_CLIMATECONTROLDATA.setVentilationMode(GENERAL_VENTILATIONMODE);
 
+		GENERAL_SEATCONTROLDATA.setMemory(GENERAL_SEATMEMORYACTION);
+		GENERAL_SEATCONTROLDATA.setMassageCushionFirmness(GENERAL_MASSAGECUSHIONFIRMNESS_LIST);
+		GENERAL_SEATCONTROLDATA.setMassageMode(GENERAL_MASSAGEMODEDATA_LIST);
+		GENERAL_SEATCONTROLDATA.setMassageEnabled(GENERAL_BOOLEAN);
+		GENERAL_SEATCONTROLDATA.setHeadSupportHorizontalPosition(GENERAL_INT);
+		GENERAL_SEATCONTROLDATA.setHeadSupportVerticalPosition(GENERAL_INT);
+		GENERAL_SEATCONTROLDATA.setBackTiltAngle(GENERAL_INT);
+		GENERAL_SEATCONTROLDATA.setBackVerticalPosition(GENERAL_INT);
+		GENERAL_SEATCONTROLDATA.setFrontVerticalPosition(GENERAL_INT);
+		GENERAL_SEATCONTROLDATA.setVerticalPosition(GENERAL_INT);
+		GENERAL_SEATCONTROLDATA.setHorizontalPosition(GENERAL_INT);
+		GENERAL_SEATCONTROLDATA.setCoolingLevel(GENERAL_INT);
+		GENERAL_SEATCONTROLDATA.setHeatingLevel(GENERAL_INT);
+		GENERAL_SEATCONTROLDATA.setHeatingEnabled(GENERAL_BOOLEAN);
+		GENERAL_SEATCONTROLDATA.setCoolingEnabled(GENERAL_BOOLEAN);
+		GENERAL_SEATCONTROLDATA.setId(GENERAL_SUPPORTEDSEAT);
+
 		GENERAL_RDSDATA.setProgramService(GENERAL_STRING);
 		GENERAL_RDSDATA.setRadioText(GENERAL_STRING);
 		GENERAL_RDSDATA.setClockText(GENERAL_STRING);
@@ -417,16 +463,24 @@ public class Test {
 		GENERAL_CHOICE.setImage(GENERAL_IMAGE);
 		GENERAL_CHOICE.setSecondaryImage(GENERAL_IMAGE);
 		GENERAL_CHOICE.setVrCommands(GENERAL_STRING_LIST);
-		
+
+		GENERAL_MASSAGEMODEDATA.setMassageMode(GENERAL_MASSAGEMODE);
+		GENERAL_MASSAGEMODEDATA.setMassageZone(GENERAL_MASSAGEZONE);
+		GENERAL_MASSAGEMODEDATA_LIST.add(GENERAL_MASSAGEMODEDATA);
+
+		GENERAL_MASSAGECUSHIONFIRMNESS.setCushion(GENERAL_MASSAGECUSHION);
+		GENERAL_MASSAGECUSHIONFIRMNESS.setFirmness(GENERAL_INT);
+		GENERAL_MASSAGECUSHIONFIRMNESS_LIST.add(GENERAL_MASSAGECUSHIONFIRMNESS);
+
 		GENERAL_TOUCHCOORD.setX(GENERAL_INT);
-		GENERAL_TOUCHCOORD.setY(GENERAL_INT);		
+		GENERAL_TOUCHCOORD.setY(GENERAL_INT);
 		GENERAL_TOUCHCOORD_LIST.add(GENERAL_TOUCHCOORD);
-		
+
 		GENERAL_TOUCHEVENT.setId(GENERAL_INT);
 		GENERAL_TOUCHEVENT.setTs(GENERAL_LONG_LIST);
-		GENERAL_TOUCHEVENT.setC(GENERAL_TOUCHCOORD_LIST);		
+		GENERAL_TOUCHEVENT.setC(GENERAL_TOUCHCOORD_LIST);
 		GENERAL_TOUCHEVENT_LIST.add(GENERAL_TOUCHEVENT);
-		
+
 		GENERAL_TEXTFIELD.setName(GENERAL_TEXTFIELDNAME);
 		GENERAL_TEXTFIELD.setRows(GENERAL_INT);
 		GENERAL_TEXTFIELD.setWidth(GENERAL_INT);
@@ -453,24 +507,24 @@ public class Test {
 		GENERAL_LOCATIONDETAILS.setLocationName(GENERAL_STRING);
 		GENERAL_LOCATIONDETAILS.setSearchAddress(GENERAL_OASISADDRESS);
 		GENERAL_LOCATIONDETAILS.setPhoneNumber(GENERAL_STRING);
-		
+
 		GENERAL_FILETYPE_LIST.add(GENERAL_FILETYPE);
-		
+
 		GENERAL_IMAGEFIELD.setImageResolution(GENERAL_IMAGERESOLUTION);
 		GENERAL_IMAGEFIELD.setName(GENERAL_IMAGEFIELDNAME);
 		GENERAL_IMAGEFIELD.setImageTypeSupported(GENERAL_FILETYPE_LIST);
 		GENERAL_IMAGEFIELD_LIST.add(GENERAL_IMAGEFIELD);
-		
+
 		GENERAL_SCREENPARAMS.setImageResolution(GENERAL_IMAGERESOLUTION);
 		GENERAL_SCREENPARAMS.setTouchEventAvailable(GENERAL_TOUCHEVENTCAPABILITIES);
-		
+
 		GENERAL_MEDIACLOCKFORMAT_LIST.add(MediaClockFormat.CLOCK1);
 		GENERAL_MEDIACLOCKFORMAT_LIST.add(MediaClockFormat.CLOCK2);
-		
+
 		GENERAL_IMAGE.setValue(GENERAL_STRING);
 		GENERAL_IMAGE.setImageType(GENERAL_IMAGETYPE);
 		GENERAL_IMAGE.setIsTemplate(GENERAL_BOOLEAN);
-		
+
 		GENERAL_SOFTBUTTON.setIsHighlighted(GENERAL_BOOLEAN);
 		GENERAL_SOFTBUTTON.setSoftButtonID(GENERAL_INT);
 		GENERAL_SOFTBUTTON.setSystemAction(SystemAction.STEAL_FOCUS);
@@ -478,63 +532,63 @@ public class Test {
 		GENERAL_SOFTBUTTON.setType(SoftButtonType.SBT_TEXT);
 		GENERAL_SOFTBUTTON.setImage(GENERAL_IMAGE);
 		GENERAL_SOFTBUTTON_LIST.add(GENERAL_SOFTBUTTON);
-		
+
 		GENERAL_TURN.setNavigationText(GENERAL_STRING);
 		GENERAL_TURN.setTurnIcon(GENERAL_IMAGE);
 		GENERAL_TURN_LIST.add(GENERAL_TURN);
-		
+
 		GENERAL_MENUPARAMS.setMenuName(GENERAL_STRING);
 		GENERAL_MENUPARAMS.setParentID(GENERAL_INT);
 		GENERAL_MENUPARAMS.setPosition(GENERAL_INT);
-				
+
 		GENERAL_VRHELPITEM.setText(GENERAL_STRING);
 		GENERAL_VRHELPITEM.setImage(GENERAL_IMAGE);
-		GENERAL_VRHELPITEM.setPosition(100);	    	
+		GENERAL_VRHELPITEM.setPosition(100);
     	GENERAL_VRHELPITEM_LIST.add(GENERAL_VRHELPITEM);
-    	
+
     	GENERAL_TTSCHUNK_LIST.add(TTSChunkFactory.createChunk(SpeechCapabilities.TEXT, "Welcome to the jungle"));
     	GENERAL_TTSCHUNK_LIST.add(TTSChunkFactory.createChunk(SpeechCapabilities.TEXT, "Say a command"));
-		
+
     	GENERAL_KEYBOARDPROPERTIES.setAutoCompleteText(GENERAL_STRING);
     	GENERAL_KEYBOARDPROPERTIES.setKeypressMode(KeypressMode.SINGLE_KEYPRESS);
     	GENERAL_KEYBOARDPROPERTIES.setKeyboardLayout(KeyboardLayout.QWERTY);
     	GENERAL_KEYBOARDPROPERTIES.setLanguage(Language.EN_US);
     	GENERAL_KEYBOARDPROPERTIES.setLimitedCharacterList(Test.GENERAL_STRING_LIST);
-    	
+
     	GENERAL_STARTTIME.setHours(GENERAL_INT);
 		GENERAL_STARTTIME.setMinutes(GENERAL_INT);
 		GENERAL_STARTTIME.setSeconds(GENERAL_INT);
-		
+
         GENERAL_CHOICE_LIST.add(GENERAL_CHOICE);
-        
+
         GENERAL_DEVICEINFO.setCarrier(GENERAL_STRING);
         GENERAL_DEVICEINFO.setFirmwareRev(GENERAL_STRING);
         GENERAL_DEVICEINFO.setHardware(GENERAL_STRING);
         GENERAL_DEVICEINFO.setMaxNumberRFCOMMPorts(GENERAL_INT);
         GENERAL_DEVICEINFO.setOs(GENERAL_STRING);
         GENERAL_DEVICEINFO.setOsVersion(GENERAL_STRING);
-        
+
         GENERAL_SDLMSGVERSION.setMajorVersion(GENERAL_INT);
         GENERAL_SDLMSGVERSION.setMinorVersion(GENERAL_INT);
-        
+
         GENERAL_APPHMITYPE_LIST.add(AppHMIType.BACKGROUND_PROCESS);
         GENERAL_APPHMITYPE_LIST.add(AppHMIType.COMMUNICATION);
-        
+
         GENERAL_GLOBALPROPERTY_LIST.add(GlobalProperty.HELPPROMPT);
         GENERAL_GLOBALPROPERTY_LIST.add(GlobalProperty.MENUICON);
-        
+
         for (VehicleDataType data : VehicleDataType.values()) {
         	VehicleDataResult result = new VehicleDataResult();
             result.setResultCode(VehicleDataResultCode.SUCCESS);
             result.setDataType(data);
         	GENERAL_VEHICLEDATARESULT_LIST.add(result);
         }
-        
+
         GENERAL_DIDRESULT.setData(GENERAL_STRING);
         GENERAL_DIDRESULT.setDidLocation(GENERAL_INT);
         GENERAL_DIDRESULT.setResultCode(VehicleDataResultCode.SUCCESS);
         GENERAL_DIDRESULT_LIST.add(GENERAL_DIDRESULT);
-        
+
         GENERAL_DISPLAYCAPABILITIES.setDisplayType(GENERAL_DISPLAYTYPE);
         GENERAL_DISPLAYCAPABILITIES.setDisplayName(GENERAL_STRING);
         GENERAL_DISPLAYCAPABILITIES.setGraphicSupported(GENERAL_BOOLEAN);
@@ -544,48 +598,48 @@ public class Test {
         GENERAL_DISPLAYCAPABILITIES.setScreenParams(GENERAL_SCREENPARAMS);
         GENERAL_DISPLAYCAPABILITIES.setTemplatesAvailable(GENERAL_STRING_LIST);
         GENERAL_DISPLAYCAPABILITIES.setTextFields(GENERAL_TEXTFIELD_LIST);
-		
+
         GENERAL_PRESETBANKCAPABILITIES.setOnScreenPresetsAvailable(GENERAL_BOOLEAN);
-        
+
         GENERAL_BUTTONCAPABILITIES.setLongPressAvailable(false);
         GENERAL_BUTTONCAPABILITIES.setShortPressAvailable(true);
         GENERAL_BUTTONCAPABILITIES.setUpDownAvailable(true);
-        GENERAL_BUTTONCAPABILITIES.setName(ButtonName.SEEKRIGHT);        
+        GENERAL_BUTTONCAPABILITIES.setName(ButtonName.SEEKRIGHT);
         GENERAL_BUTTONCAPABILITIES_LIST.add(GENERAL_BUTTONCAPABILITIES);
-        
+
         GENERAL_SOFTBUTTONCAPABILITIES.setLongPressAvailable(GENERAL_BOOLEAN);
         GENERAL_SOFTBUTTONCAPABILITIES.setShortPressAvailable(GENERAL_BOOLEAN);
         GENERAL_SOFTBUTTONCAPABILITIES.setUpDownAvailable(GENERAL_BOOLEAN);
         GENERAL_SOFTBUTTONCAPABILITIES.setImageSupported(GENERAL_BOOLEAN);
-        GENERAL_SOFTBUTTONCAPABILITIES_LIST.add(GENERAL_SOFTBUTTONCAPABILITIES);        
-        
+        GENERAL_SOFTBUTTONCAPABILITIES_LIST.add(GENERAL_SOFTBUTTONCAPABILITIES);
+
         GENERAL_VEHICLETYPE.setMake(GENERAL_STRING);
         GENERAL_VEHICLETYPE.setModel(GENERAL_STRING);
         GENERAL_VEHICLETYPE.setModelYear(GENERAL_STRING);
         GENERAL_VEHICLETYPE.setTrim(GENERAL_STRING);
-        
+
         GENERAL_AUDIOPASSTHRUCAPABILITIES.setAudioType(GENERAL_AUDIOTYPE);
         GENERAL_AUDIOPASSTHRUCAPABILITIES.setBitsPerSample(GENERAL_BITSPERSAMPLE);
         GENERAL_AUDIOPASSTHRUCAPABILITIES.setSamplingRate(GENERAL_SAMPLINGRATE);
         GENERAL_AUDIOPASSTHRUCAPABILITIES_LIST.add(GENERAL_AUDIOPASSTHRUCAPABILITIES);
-        
+
         GENERAL_PRERECORDEDSPEECH_LIST.add(PrerecordedSpeech.HELP_JINGLE);
         GENERAL_PRERECORDEDSPEECH_LIST.add(PrerecordedSpeech.INITIAL_JINGLE);
-        
+
         GENERAL_HMIZONECAPABILITIES_LIST.add(HmiZoneCapabilities.BACK);
         GENERAL_HMIZONECAPABILITIES_LIST.add(HmiZoneCapabilities.FRONT);
-        
+
         GENERAL_SPEECHCAPABILITIES_LIST.add(SpeechCapabilities.SILENCE);
         GENERAL_SPEECHCAPABILITIES_LIST.add(SpeechCapabilities.TEXT);
-        
+
         GENERAL_VRCAPABILITIES_LIST.add(VrCapabilities.TEXT);
-        
+
         GENERAL_HMIPERMISSIONS.setAllowed(GENERAL_HMILEVEL_LIST);
         GENERAL_HMIPERMISSIONS.setUserDisallowed(GENERAL_HMILEVEL_LIST);
-        
+
         GENERAL_PARAMETERPERMISSIONS.setAllowed(GENERAL_STRING_LIST);
         GENERAL_PARAMETERPERMISSIONS.setUserDisallowed(GENERAL_STRING_LIST);
-        
+
         GENERAL_PERMISSIONITEM.setRpcName(GENERAL_STRING);
         GENERAL_PERMISSIONITEM.setHMIPermissions(GENERAL_HMIPERMISSIONS);
         GENERAL_PERMISSIONITEM.setParameterPermissions(GENERAL_PARAMETERPERMISSIONS);
@@ -635,6 +689,24 @@ public class Test {
 		GENERAL_RADIOCONTROLCAPABILITIES.setSignalChangeThresholdAvailable(GENERAL_BOOLEAN);
 		GENERAL_RADIOCONTROLCAPABILITIES_LIST.add(GENERAL_RADIOCONTROLCAPABILITIES);
 
+		GENERAL_SEATCONTROLCAPABILITIES.setMemoryAvailable(GENERAL_BOOLEAN);
+		GENERAL_SEATCONTROLCAPABILITIES.setMassageCushionFirmnessAvailable(GENERAL_BOOLEAN);
+		GENERAL_SEATCONTROLCAPABILITIES.setMassageModeAvailable(GENERAL_BOOLEAN);
+		GENERAL_SEATCONTROLCAPABILITIES.setMassageEnabledAvailable(GENERAL_BOOLEAN);
+		GENERAL_SEATCONTROLCAPABILITIES.setHeadSupportVerticalPositionAvailable(GENERAL_BOOLEAN);
+		GENERAL_SEATCONTROLCAPABILITIES.setHeadSupportHorizontalPositionAvailable(GENERAL_BOOLEAN);
+		GENERAL_SEATCONTROLCAPABILITIES.setBackTiltAngleAvailable(GENERAL_BOOLEAN);
+		GENERAL_SEATCONTROLCAPABILITIES.setBackVerticalPositionAvailable(GENERAL_BOOLEAN);
+		GENERAL_SEATCONTROLCAPABILITIES.setFrontVerticalPositionAvailable(GENERAL_BOOLEAN);
+		GENERAL_SEATCONTROLCAPABILITIES.setVerticalPositionAvailable(GENERAL_BOOLEAN);
+		GENERAL_SEATCONTROLCAPABILITIES.setHorizontalPositionAvailable(GENERAL_BOOLEAN);
+		GENERAL_SEATCONTROLCAPABILITIES.setCoolingLevelAvailable(GENERAL_BOOLEAN);
+		GENERAL_SEATCONTROLCAPABILITIES.setHeatingLevelAvailable(GENERAL_BOOLEAN);
+		GENERAL_SEATCONTROLCAPABILITIES.setCoolingEnabledAvailable(GENERAL_BOOLEAN);
+		GENERAL_SEATCONTROLCAPABILITIES.setHeatingEnabledAvailable(GENERAL_BOOLEAN);
+		GENERAL_SEATCONTROLCAPABILITIES.setModuleName(GENERAL_STRING);
+		GENERAL_SEATCONTROLCAPABILITIES_LIST.add(GENERAL_SEATCONTROLCAPABILITIES);
+
 		GENERAL_REMOTECONTROLCAPABILITIES.setButtonCapabilities(GENERAL_BUTTONCAPABILITIES_LIST);
 		GENERAL_REMOTECONTROLCAPABILITIES.setClimateControlCapabilities(GENERAL_CLIMATECONTROLCAPABILITIES_LIST);
 		GENERAL_REMOTECONTROLCAPABILITIES.setRadioControlCapabilities(GENERAL_RADIOCONTROLCAPABILITIES_LIST);
@@ -673,7 +745,7 @@ public class Test {
 		GENERAL_DAYCOLORSCHEME.setSecondaryColor(GENERAL_RGBCOLOR);
 		GENERAL_DAYCOLORSCHEME.setBackgroundColor(GENERAL_RGBCOLOR);
 
-        
+
 		try {
 			JSON_HMIPERMISSIONS.put(HMIPermissions.KEY_ALLOWED, GENERAL_HMILEVEL_LIST);
 			JSON_HMIPERMISSIONS.put(HMIPermissions.KEY_USER_DISALLOWED, GENERAL_HMILEVEL_LIST);
@@ -681,14 +753,14 @@ public class Test {
 			JSON_PCMSTREAMCAPABILITIES.put(AudioPassThruCapabilities.KEY_AUDIO_TYPE, GENERAL_AUDIOTYPE);
 			JSON_PCMSTREAMCAPABILITIES.put(AudioPassThruCapabilities.KEY_BITS_PER_SAMPLE, GENERAL_BITSPERSAMPLE);
 			JSON_PCMSTREAMCAPABILITIES.put(AudioPassThruCapabilities.KEY_SAMPLING_RATE, GENERAL_SAMPLINGRATE);
-			
+
 			JSON_TOUCHEVENTCAPABILITIES.put(TouchEventCapabilities.KEY_DOUBLE_PRESS_AVAILABLE, GENERAL_BOOLEAN);
 			JSON_TOUCHEVENTCAPABILITIES.put(TouchEventCapabilities.KEY_MULTI_TOUCH_AVAILABLE, GENERAL_BOOLEAN);
 			JSON_TOUCHEVENTCAPABILITIES.put(TouchEventCapabilities.KEY_PRESS_AVAILABLE, GENERAL_BOOLEAN);
-			
+
 			JSON_IMAGERESOLUTION.put(ImageResolution.KEY_RESOLUTION_HEIGHT, GENERAL_INT);
 			JSON_IMAGERESOLUTION.put(ImageResolution.KEY_RESOLUTION_WIDTH, GENERAL_INT);
-			
+
 			JSON_CHOICE.put(Choice.KEY_MENU_NAME, GENERAL_STRING);
 			JSON_CHOICE.put(Choice.KEY_SECONDARY_TEXT, GENERAL_STRING);
 			JSON_CHOICE.put(Choice.KEY_TERTIARY_TEXT, GENERAL_STRING);
@@ -696,25 +768,25 @@ public class Test {
 			JSON_CHOICE.put(Choice.KEY_IMAGE, JSON_IMAGE);
 			JSON_CHOICE.put(Choice.KEY_SECONDARY_IMAGE, JSON_IMAGE);
 			JSON_CHOICE.put(Choice.KEY_VR_COMMANDS, JsonUtils.createJsonArray(GENERAL_STRING_LIST));
-			
+
 			JSON_HMILEVELS.put(HMILevel.HMI_FULL);
 			JSON_HMILEVELS.put(HMILevel.HMI_BACKGROUND);
-			
+
 			JSON_HMIPERMISSIONS.put(HMIPermissions.KEY_ALLOWED, JSON_HMILEVELS);
 			JSON_HMIPERMISSIONS.put(HMIPermissions.KEY_USER_DISALLOWED, JSON_HMILEVELS);
-			
+
 			JSON_PARAMETERPERMISSIONS.put(ParameterPermissions.KEY_ALLOWED, JsonUtils.createJsonArray(GENERAL_STRING_LIST));
 			JSON_PARAMETERPERMISSIONS.put(ParameterPermissions.KEY_USER_DISALLOWED, JsonUtils.createJsonArray(GENERAL_STRING_LIST));
-			
+
 			JSON_PERMISSIONITEM.put(PermissionItem.KEY_HMI_PERMISSIONS, JSON_HMIPERMISSIONS);
 			JSON_PERMISSIONITEM.put(PermissionItem.KEY_PARAMETER_PERMISSIONS, JSON_PARAMETERPERMISSIONS);
 			JSON_PERMISSIONITEM.put(PermissionItem.KEY_RPC_NAME, GENERAL_STRING);
 			JSON_PERMISSIONITEMS.put(JSON_PERMISSIONITEM);
-			
+
 			JSON_IMAGE.put(Image.KEY_IMAGE_TYPE, GENERAL_IMAGETYPE);
 			JSON_IMAGE.put(Image.KEY_VALUE, GENERAL_STRING);
 			JSON_IMAGE.put(Image.KEY_IS_TEMPLATE, GENERAL_BOOLEAN);
-			
+
 			JSON_SOFTBUTTON.put(SoftButton.KEY_IS_HIGHLIGHTED , GENERAL_BOOLEAN);
 			JSON_SOFTBUTTON.put(SoftButton.KEY_SOFT_BUTTON_ID, GENERAL_INT);
 			JSON_SOFTBUTTON.put(SoftButton.KEY_SYSTEM_ACTION, SystemAction.STEAL_FOCUS);
@@ -722,20 +794,20 @@ public class Test {
 			JSON_SOFTBUTTON.put(SoftButton.KEY_TYPE, SoftButtonType.SBT_TEXT);
 			JSON_SOFTBUTTON.put(SoftButton.KEY_IMAGE, GENERAL_IMAGE.serializeJSON());
 			JSON_SOFTBUTTONS.put(JSON_SOFTBUTTON);
-			
+
 			JSON_TURN.put(Turn.KEY_NAVIGATION_TEXT, GENERAL_STRING);
 			JSON_TURN.put(Turn.KEY_TURN_IMAGE, GENERAL_IMAGE.serializeJSON());
 			JSON_TURNS.put(JSON_TURN);
-			
+
 			JSON_MENUPARAMS.put(MenuParams.KEY_MENU_NAME, GENERAL_STRING);
 			JSON_MENUPARAMS.put(MenuParams.KEY_PARENT_ID, GENERAL_INT);
 			JSON_MENUPARAMS.put(MenuParams.KEY_POSITION, GENERAL_INT);
-			
+
 	    	JSON_VRHELPITEM.put(VrHelpItem.KEY_TEXT, GENERAL_STRING);
 	    	JSON_VRHELPITEM.put(VrHelpItem.KEY_IMAGE, JSON_IMAGE);
 	    	JSON_VRHELPITEM.put(VrHelpItem.KEY_POSITION, GENERAL_INT);
 	    	JSON_VRHELPITEMS.put(JSON_VRHELPITEM);
-	    	
+
 	    	JSONObject jsonTtsChunk = new JSONObject();
 	    	jsonTtsChunk.put(TTSChunk.KEY_TEXT, "Welcome to the jungle");
 	    	jsonTtsChunk.put(TTSChunk.KEY_TYPE, SpeechCapabilities.TEXT);
@@ -744,19 +816,19 @@ public class Test {
 	    	jsonTtsChunk.put(TTSChunk.KEY_TEXT, "Say a command");
 	    	jsonTtsChunk.put(TTSChunk.KEY_TYPE, SpeechCapabilities.TEXT);
 	    	JSON_TTSCHUNKS.put(jsonTtsChunk);
-	    	
+
 	    	JSON_KEYBOARDPROPERTIES.put(KeyboardProperties.KEY_AUTO_COMPLETE_TEXT, GENERAL_STRING);
 	    	JSON_KEYBOARDPROPERTIES.put(KeyboardProperties.KEY_KEYPRESS_MODE, KeypressMode.SINGLE_KEYPRESS);
 	    	JSON_KEYBOARDPROPERTIES.put(KeyboardProperties.KEY_KEYBOARD_LAYOUT, KeyboardLayout.QWERTY);
 	    	JSON_KEYBOARDPROPERTIES.put(KeyboardProperties.KEY_LANGUAGE, Language.EN_US);
 	    	JSON_KEYBOARDPROPERTIES.put(KeyboardProperties.KEY_LIMITED_CHARACTER_LIST, JsonUtils.createJsonArray(GENERAL_STRING_LIST));
-	    	
+
 			JSON_STARTTIME.put(StartTime.KEY_HOURS, GENERAL_STARTTIME.getHours());
 			JSON_STARTTIME.put(StartTime.KEY_MINUTES, GENERAL_STARTTIME.getMinutes());
 			JSON_STARTTIME.put(StartTime.KEY_SECONDS, GENERAL_STARTTIME.getSeconds());
-					
+
 			JSON_CHOICES.put(JSON_CHOICE);
-			
+
 			JSON_DEVICEINFO.put(DeviceInfo.KEY_CARRIER, GENERAL_STRING);
 			JSON_DEVICEINFO.put(DeviceInfo.KEY_FIRMWARE_REV, GENERAL_STRING);
 			JSON_DEVICEINFO.put(DeviceInfo.KEY_HARDWARE, GENERAL_STRING);
@@ -775,17 +847,17 @@ public class Test {
 			JSON_NIGHTCOLORSCHEME.put(TemplateColorScheme.KEY_PRIMARY_COLOR, JSON_RGBCOLOR);
 			JSON_NIGHTCOLORSCHEME.put(TemplateColorScheme.KEY_SECONDARY_COLOR, JSON_RGBCOLOR);
 			JSON_NIGHTCOLORSCHEME.put(TemplateColorScheme.KEY_BACKGROUND_COLOR, JSON_RGBCOLOR);
-			
+
 			JSON_SDLMSGVERSION.put(SdlMsgVersion.KEY_MAJOR_VERSION, GENERAL_INT);
-			JSON_SDLMSGVERSION.put(SdlMsgVersion.KEY_MINOR_VERSION, GENERAL_INT);	
-			
+			JSON_SDLMSGVERSION.put(SdlMsgVersion.KEY_MINOR_VERSION, GENERAL_INT);
+
 			JSON_DIDRESULT.put(DIDResult.KEY_DATA, GENERAL_STRING);
 			JSON_DIDRESULT.put(DIDResult.KEY_DID_LOCATION, GENERAL_INT);
 			JSON_DIDRESULT.put(DIDResult.KEY_RESULT_CODE, VehicleDataResultCode.SUCCESS);
 			JSON_DIDRESULTS.put(JSON_DIDRESULT);
-			
+
 			JSON_PRESETBANKCAPABILITIES.put(PresetBankCapabilities.KEY_ON_SCREEN_PRESETS_AVAILABLE, GENERAL_BOOLEAN);
-			
+
 			JSONObject jsonButton = new JSONObject();
 			jsonButton.put(ButtonCapabilities.KEY_LONG_PRESS_AVAILABLE, false);
 			jsonButton.put(ButtonCapabilities.KEY_SHORT_PRESS_AVAILABLE, GENERAL_BOOLEAN);
@@ -827,32 +899,32 @@ public class Test {
 			jsonButton.put(SoftButtonCapabilities.KEY_UP_DOWN_AVAILABLE, GENERAL_BOOLEAN);
 			jsonButton.put(SoftButtonCapabilities.KEY_IMAGE_SUPPORTED, GENERAL_BOOLEAN);
 			JSON_SOFTBUTTONCAPABILITIES.put(jsonButton);
-			
+
 			jsonButton = new JSONObject();
 			jsonButton.put(AudioPassThruCapabilities.KEY_AUDIO_TYPE, GENERAL_AUDIOTYPE);
 			jsonButton.put(AudioPassThruCapabilities.KEY_BITS_PER_SAMPLE, GENERAL_BITSPERSAMPLE);
 			jsonButton.put(AudioPassThruCapabilities.KEY_SAMPLING_RATE, GENERAL_SAMPLINGRATE);
 			JSON_AUDIOPASSTHRUCAPABILITIES.put(jsonButton);
-			
+
 			JSON_TEXTFIELD.put(TextField.KEY_CHARACTER_SET, CharacterSet.CID1SET);
 			JSON_TEXTFIELD.put(TextField.KEY_NAME, TextFieldName.ETA);
 			JSON_TEXTFIELD.put(TextField.KEY_ROWS, GENERAL_INT);
 			JSON_TEXTFIELD.put(TextField.KEY_WIDTH, GENERAL_INT);
 			JSON_TEXTFIELDS.put(JSON_TEXTFIELD);
-			
+
 			JSON_IMAGEFIELD.put(ImageField.KEY_IMAGE_RESOLUTION, JSON_IMAGERESOLUTION);
 			JSON_IMAGEFIELD.put(ImageField.KEY_IMAGE_TYPE_SUPPORTED, JsonUtils.createJsonArray(Test.GENERAL_FILETYPE_LIST));
 			JSON_IMAGEFIELD.put(ImageField.KEY_NAME, ImageFieldName.graphic);
 			JSON_IMAGEFIELDS.put(JSON_IMAGEFIELD);
-			
+
 			JSONObject jsonTEC = new JSONObject();
 			jsonTEC.put(TouchEventCapabilities.KEY_DOUBLE_PRESS_AVAILABLE, GENERAL_BOOLEAN);
 			jsonTEC.put(TouchEventCapabilities.KEY_MULTI_TOUCH_AVAILABLE, GENERAL_BOOLEAN);
 			jsonTEC.put(TouchEventCapabilities.KEY_PRESS_AVAILABLE, GENERAL_BOOLEAN);
-			
+
 			JSON_SCREENPARAMS.put(ScreenParams.KEY_RESOLUTION, JSON_IMAGERESOLUTION);
 			JSON_SCREENPARAMS.put(ScreenParams.KEY_TOUCH_EVENT_AVAILABLE, jsonTEC);
-			
+
 			JSON_DISPLAYCAPABILITIES.put(DisplayCapabilities.KEY_DISPLAY_TYPE, GENERAL_DISPLAYTYPE);
 			JSON_DISPLAYCAPABILITIES.put(DisplayCapabilities.KEY_DISPLAY_NAME, GENERAL_STRING);
 			JSON_DISPLAYCAPABILITIES.put(DisplayCapabilities.KEY_GRAPHIC_SUPPORTED, GENERAL_BOOLEAN);
@@ -862,11 +934,11 @@ public class Test {
 			JSON_DISPLAYCAPABILITIES.put(DisplayCapabilities.KEY_SCREEN_PARAMS, JSON_SCREENPARAMS);
 			JSON_DISPLAYCAPABILITIES.put(DisplayCapabilities.KEY_TEMPLATES_AVAILABLE, JsonUtils.createJsonArray(GENERAL_STRING_LIST));
 			JSON_DISPLAYCAPABILITIES.put(DisplayCapabilities.KEY_TEXT_FIELDS, JSON_TEXTFIELDS);
-			
+
 			JSON_TOUCHCOORD.put(TouchCoord.KEY_X, GENERAL_INT);
 			JSON_TOUCHCOORD.put(TouchCoord.KEY_Y, GENERAL_INT);
 			JSON_TOUCHCOORDS.put(JSON_TOUCHCOORD);
-			
+
 			JSON_TOUCHEVENT.put(TouchEvent.KEY_C, JSON_TOUCHCOORDS);
 			JSON_TOUCHEVENT.put(TouchEvent.KEY_ID, GENERAL_INT);
 			JSON_TOUCHEVENT.put(TouchEvent.KEY_TS, JsonUtils.createJsonArray(GENERAL_LONG_LIST));
@@ -875,9 +947,9 @@ public class Test {
 			JSON_TEXTFIELDTYPES.put(MetadataType.CURRENT_TEMPERATURE);
 			JSON_TEXTFIELDTYPES.put(MetadataType.MEDIA_ALBUM);
 			JSON_TEXTFIELDTYPES.put(MetadataType.MEDIA_ARTIST);
-			
+
 		} catch (JSONException e) {
 			Log.e("Test", "Static Json Construction Failed.", e);
 		}
-	}	
+	}
 }
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/Validator.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/Validator.java
index ec3add129..3786f0ca6 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/Validator.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/Validator.java
@@ -1,8 +1,5 @@
 package com.smartdevicelink.test;
 
-import java.util.Iterator;
-import java.util.List;
-
 import com.smartdevicelink.protocol.enums.FrameData;
 import com.smartdevicelink.protocol.enums.FrameDataControlFrameType;
 import com.smartdevicelink.protocol.enums.FrameType;
@@ -33,6 +30,8 @@ import com.smartdevicelink.proxy.rpc.Image;
 import com.smartdevicelink.proxy.rpc.ImageField;
 import com.smartdevicelink.proxy.rpc.ImageResolution;
 import com.smartdevicelink.proxy.rpc.KeyboardProperties;
+import com.smartdevicelink.proxy.rpc.MassageCushionFirmness;
+import com.smartdevicelink.proxy.rpc.MassageModeData;
 import com.smartdevicelink.proxy.rpc.MenuParams;
 import com.smartdevicelink.proxy.rpc.ModuleData;
 import com.smartdevicelink.proxy.rpc.MyKey;
@@ -46,10 +45,13 @@ import com.smartdevicelink.proxy.rpc.RGBColor;
 import com.smartdevicelink.proxy.rpc.RadioControlCapabilities;
 import com.smartdevicelink.proxy.rpc.RadioControlData;
 import com.smartdevicelink.proxy.rpc.RdsData;
-import com.smartdevicelink.proxy.rpc.RemoteControlCapabilities;
 import com.smartdevicelink.proxy.rpc.Rectangle;
+import com.smartdevicelink.proxy.rpc.RemoteControlCapabilities;
 import com.smartdevicelink.proxy.rpc.ScreenParams;
 import com.smartdevicelink.proxy.rpc.SdlMsgVersion;
+import com.smartdevicelink.proxy.rpc.SeatControlCapabilities;
+import com.smartdevicelink.proxy.rpc.SeatControlData;
+import com.smartdevicelink.proxy.rpc.SeatMemoryAction;
 import com.smartdevicelink.proxy.rpc.SingleTireStatus;
 import com.smartdevicelink.proxy.rpc.SoftButton;
 import com.smartdevicelink.proxy.rpc.SoftButtonCapabilities;
@@ -71,9 +73,12 @@ import com.smartdevicelink.proxy.rpc.VrHelpItem;
 import com.smartdevicelink.proxy.rpc.enums.DefrostZone;
 import com.smartdevicelink.proxy.rpc.enums.FileType;
 import com.smartdevicelink.proxy.rpc.enums.HMILevel;
-import com.smartdevicelink.proxy.rpc.enums.VentilationMode;
 import com.smartdevicelink.proxy.rpc.enums.HmiZoneCapabilities;
 import com.smartdevicelink.proxy.rpc.enums.SpeechCapabilities;
+import com.smartdevicelink.proxy.rpc.enums.VentilationMode;
+
+import java.util.Iterator;
+import java.util.List;
 
 public class Validator{
 
@@ -708,6 +713,62 @@ public class Validator{
         return true;
     }
 
+	public static boolean validateSeatControlData(SeatControlData seatControlData1, SeatControlData seatControlData2) {
+		if (seatControlData1 == null) {
+			return (seatControlData2 == null);
+		}
+		if (seatControlData2 == null) {
+			return (seatControlData1 == null);
+		}
+
+		if (seatControlData1.getCoolingEnabled() != seatControlData2.getCoolingEnabled()) {
+			return false;
+		}
+		if (seatControlData1.getHeatingEnabled() != seatControlData2.getHeatingEnabled()) {
+			return false;
+		}
+		if (seatControlData1.getMassageEnabled() != seatControlData2.getMassageEnabled()) {
+			return false;
+		}
+		if (seatControlData1.getBackTiltAngle() != seatControlData2.getBackTiltAngle()) {
+			return false;
+		}
+		if (seatControlData1.getBackVerticalPosition() != seatControlData2.getBackVerticalPosition()) {
+			return false;
+		}
+		if (seatControlData1.getCoolingLevel() != seatControlData2.getCoolingLevel()) {
+			return false;
+		}
+		if (seatControlData1.getFrontVerticalPosition() != seatControlData2.getFrontVerticalPosition()) {
+			return false;
+		}
+		if (seatControlData1.getHeadSupportHorizontalPosition() != seatControlData2.getHeadSupportHorizontalPosition()) {
+			return false;
+		}
+		if (seatControlData1.getHeadSupportVerticalPosition() != seatControlData2.getHeadSupportVerticalPosition()) {
+			return false;
+		}
+		if (seatControlData1.getHeatingLevel() != seatControlData2.getHeatingLevel()) {
+			return false;
+		}
+		if (seatControlData1.getHorizontalPosition() != seatControlData2.getHorizontalPosition()) {
+			return false;
+		}
+		if (seatControlData1.getId() != seatControlData2.getId()) {
+			return false;
+		}
+
+		if (!(validateSeatMemoryAction(seatControlData1.getMemory(), seatControlData2.getMemory()))) {
+			return false;
+		}
+
+		if (!(validateSeatMemoryAction(seatControlData1.getMemory(), seatControlData2.getMemory()))) {
+			return false;
+		}
+
+		return true;
+	}
+
     public static boolean validateModuleData(ModuleData moduleData1, ModuleData moduleData2){
         if(moduleData1 == null){
             return ( moduleData2 == null );
@@ -906,6 +967,33 @@ public class Validator{
         return true;
     }
 
+	public static boolean validateSeatMemoryAction(SeatMemoryAction item1, SeatMemoryAction item2) {
+		if (item1 == null) {
+			return (item2 == null);
+		}
+		if (item2 == null) {
+			return (item1 == null);
+		}
+
+		if (item1.getAction() == null) {
+			return (item2.getAction() == null);
+		}
+
+		if (item1.getAction() != item2.getAction()) {
+			return false;
+		}
+
+		if (item1.getId() != item2.getId()) {
+			return false;
+		}
+
+		if (item1.getLabel() != item2.getLabel()) {
+			return false;
+		}
+
+		return true;
+	}
+
     public static boolean validateTextFields(TextField item1, TextField item2){
         if(item1 == null){
             return ( item2 == null );
@@ -1541,6 +1629,86 @@ public class Validator{
         return true;
     }
 
+	public static boolean validateMassageModeData(MassageModeData item1, MassageModeData item2) {
+		if (item1 == null) {
+			return (item2 == null);
+		}
+		if (item2 == null) {
+			return (item1 == null);
+		}
+
+		if (item1.getMassageMode() != item2.getMassageMode()) {
+			return false;
+		}
+
+		if (item1.getMassageZone() != item2.getMassageZone()) {
+			return false;
+		}
+
+		return true;
+	}
+
+	public static boolean validateMassageModeDataList(List<MassageModeData> item1, List<MassageModeData> item2) {
+		if (item1 == null) {
+			return (item2 == null);
+		}
+		if (item2 == null) {
+			return (item1 == null);
+		}
+
+		if (item1.size() != item2.size()) {
+			return false;
+		}
+
+		for (int i = 0; i < item1.size(); i++) {
+			if (!validateMassageModeData(item1.get(i), item2.get(i))) {
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	public static boolean validateMassageCushionFirmness(MassageCushionFirmness item1, MassageCushionFirmness item2) {
+		if (item1 == null) {
+			return (item2 == null);
+		}
+		if (item2 == null) {
+			return (item1 == null);
+		}
+
+		if (item1.getCushion() != item2.getCushion()) {
+			return false;
+		}
+
+		if (item1.getFirmness() != item2.getFirmness()) {
+			return false;
+		}
+
+		return true;
+	}
+
+	public static boolean validateMassageCushionFirmnessList(List<MassageCushionFirmness> item1, List<MassageCushionFirmness> item2) {
+		if (item1 == null) {
+			return (item2 == null);
+		}
+		if (item2 == null) {
+			return (item1 == null);
+		}
+
+		if (item1.size() != item2.size()) {
+			return false;
+		}
+
+		for (int i = 0; i < item1.size(); i++) {
+			if (!validateMassageCushionFirmness(item1.get(i), item2.get(i))) {
+				return false;
+			}
+		}
+
+		return true;
+	}
+
     public static void log(String tag, String msg){
         Logger.log(tag, msg);
     }
@@ -1634,7 +1802,7 @@ public class Validator{
 
 	    return true;
     }
-    
+
     public static boolean validateDisplayCapabilities (DisplayCapabilities item1, DisplayCapabilities item2) {
     	if (item1 == null) {
     		return ( item2 == null );
@@ -1896,6 +2064,87 @@ public class Validator{
         return true;
     }
 
+	public static boolean validateSeatControlCapabilities(SeatControlCapabilities item1, SeatControlCapabilities item2) {
+		if (item1 == null) {
+			return (item2 == null);
+		}
+		if (item2 == null) {
+			return (item1 == null);
+		}
+
+		if (item1.getModuleName() != item2.getModuleName()) {
+			return false;
+		}
+		if (item1.getHeatingEnabledAvailable() != item2.getHeatingEnabledAvailable()) {
+			return false;
+		}
+		if (item1.getCoolingEnabledAvailable() != item2.getCoolingEnabledAvailable()) {
+			return false;
+		}
+		if (item1.getHeatingLevelAvailable() != item2.getHeatingLevelAvailable()) {
+			return false;
+		}
+		if (item1.getCoolingLevelAvailable() != item2.getCoolingLevelAvailable()) {
+			return false;
+		}
+		if (item1.getHorizontalPositionAvailable() != item2.getHorizontalPositionAvailable()) {
+			return false;
+		}
+		if (item1.getVerticalPositionAvailable() != item2.getVerticalPositionAvailable()) {
+			return false;
+		}
+		if (item1.getFrontVerticalPositionAvailable() != item2.getFrontVerticalPositionAvailable()) {
+			return false;
+		}
+		if (item1.getBackVerticalPositionAvailable() != item2.getBackVerticalPositionAvailable()) {
+			return false;
+		}
+		if (item1.getBackTiltAngleAvailable() != item2.getBackTiltAngleAvailable()) {
+			return false;
+		}
+		if (item1.getHeadSupportVerticalPositionAvailable() != item2.getHeadSupportVerticalPositionAvailable()) {
+			return false;
+		}
+		if (item1.getHeadSupportHorizontalPositionAvailable() != item2.getHeadSupportHorizontalPositionAvailable()) {
+			return false;
+		}
+		if (item1.getMassageEnabledAvailable() != item2.getMassageEnabledAvailable()) {
+			return false;
+		}
+		if (item1.getMassageModeAvailable() != item2.getMassageModeAvailable()) {
+			return false;
+		}
+		if (item1.getMassageCushionFirmnessAvailable() != item2.getMassageCushionFirmnessAvailable()) {
+			return false;
+		}
+		if (item1.getMemoryAvailable() != item2.getMemoryAvailable()) {
+			return false;
+		}
+
+		return true;
+	}
+
+	public static boolean validateSeatControlCapabilitiesList(List<SeatControlCapabilities> item1, List<SeatControlCapabilities> item2) {
+		if (item1 == null) {
+			return (item2 == null);
+		}
+		if (item2 == null) {
+			return (item1 == null);
+		}
+
+		if (item1.size() != item2.size()) {
+			return false;
+		}
+
+		for (int i = 0; i < item1.size(); i++) {
+			if (!validateSeatControlCapabilities(item1.get(i), item2.get(i))) {
+				return false;
+			}
+		}
+
+		return true;
+	}
+
     public static boolean validateDefrostZones (List<DefrostZone> item1, List<DefrostZone> item2) {
         if (item1 == null) {
             return ( item2 == null );
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/VehicleDataHelper.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/VehicleDataHelper.java
index 8cd8d5296..22ce7a15b 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/VehicleDataHelper.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/VehicleDataHelper.java
@@ -22,6 +22,7 @@ import com.smartdevicelink.proxy.rpc.enums.ComponentVolumeStatus;
 import com.smartdevicelink.proxy.rpc.enums.DeviceLevelStatus;
 import com.smartdevicelink.proxy.rpc.enums.Dimension;
 import com.smartdevicelink.proxy.rpc.enums.ECallConfirmationStatus;
+import com.smartdevicelink.proxy.rpc.enums.ElectronicParkBrakeStatus;
 import com.smartdevicelink.proxy.rpc.enums.EmergencyEventType;
 import com.smartdevicelink.proxy.rpc.enums.FuelCutoffStatus;
 import com.smartdevicelink.proxy.rpc.enums.FuelType;
@@ -76,6 +77,7 @@ public class VehicleDataHelper{
 	public static final FuelRange FUEL_RANGE = new FuelRange();
 	public static final List<FuelRange> FUEL_RANGE_LIST = new ArrayList<FuelRange>(1);
 	public static final TurnSignal TURN_SIGNAL = TurnSignal.OFF;
+	public static final ElectronicParkBrakeStatus ELECTRONIC_PARK_BRAKE_STATUS = ElectronicParkBrakeStatus.CLOSED;
 
 	//other variables inside some of the above objects
     // tire status
@@ -352,6 +354,7 @@ public class VehicleDataHelper{
 		VEHICLE_DATA.setMyKey(MY_KEY);
 		VEHICLE_DATA.setFuelRange(FUEL_RANGE_LIST);
 		VEHICLE_DATA.setTurnSignal(TURN_SIGNAL);
+		VEHICLE_DATA.setElectronicParkBrakeStatus(ELECTRONIC_PARK_BRAKE_STATUS);
 		
 		//set up the GetVehicleDataResponse object
 		VEHICLE_DATA_RESPONSE.setSpeed(SPEED);
@@ -382,6 +385,7 @@ public class VehicleDataHelper{
 		VEHICLE_DATA_RESPONSE.setMyKey(MY_KEY);
 		VEHICLE_DATA_RESPONSE.setFuelRange(FUEL_RANGE_LIST);
 		VEHICLE_DATA_RESPONSE.setTurnSignal(TURN_SIGNAL);
+		VEHICLE_DATA_RESPONSE.setElectronicParkBrakeStatus(ELECTRONIC_PARK_BRAKE_STATUS);
 	}
 	
     private VehicleDataHelper(){}	
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/SdlProxyBaseTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/SdlProxyBaseTests.java
index b50f6f48d..e1bcdaf22 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/SdlProxyBaseTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/SdlProxyBaseTests.java
@@ -1,7 +1,6 @@
 package com.smartdevicelink.test.proxy;
 
 import android.content.Context;
-import android.os.Bundle;
 import android.telephony.TelephonyManager;
 import android.test.AndroidTestCase;
 import android.util.Log;
@@ -50,6 +49,7 @@ import com.smartdevicelink.proxy.rpc.OnKeyboardInput;
 import com.smartdevicelink.proxy.rpc.OnLanguageChange;
 import com.smartdevicelink.proxy.rpc.OnLockScreenStatus;
 import com.smartdevicelink.proxy.rpc.OnPermissionsChange;
+import com.smartdevicelink.proxy.rpc.OnRCStatus;
 import com.smartdevicelink.proxy.rpc.OnStreamRPC;
 import com.smartdevicelink.proxy.rpc.OnSystemRequest;
 import com.smartdevicelink.proxy.rpc.OnTBTClientState;
@@ -619,5 +619,9 @@ public class SdlProxyBaseTests extends AndroidTestCase{
 		public void onSendHapticDataResponse(SendHapticDataResponse response) {
 			Log.i(TAG, "SendHapticDataResponse response from SDL: " + response);
 		}
-    }
+
+		@Override
+		public void onOnRCStatus(OnRCStatus notification) {
+		}
+	}
 }
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/SystemCapabilityManagerTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/SystemCapabilityManagerTests.java
index 4c47d387c..9d5f3a74c 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/SystemCapabilityManagerTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/SystemCapabilityManagerTests.java
@@ -26,6 +26,7 @@ import com.smartdevicelink.proxy.rpc.enums.HmiZoneCapabilities;
 import com.smartdevicelink.proxy.rpc.enums.SpeechCapabilities;
 import com.smartdevicelink.proxy.rpc.enums.SystemCapabilityType;
 import com.smartdevicelink.proxy.rpc.listeners.OnMultipleRequestListener;
+import com.smartdevicelink.proxy.rpc.listeners.OnRPCListener;
 import com.smartdevicelink.proxy.rpc.listeners.OnRPCNotificationListener;
 import com.smartdevicelink.streaming.audio.AudioStreamingCodec;
 import com.smartdevicelink.streaming.audio.AudioStreamingParams;
@@ -178,6 +179,12 @@ public class SystemCapabilityManagerTests extends AndroidTestCase {
 		public boolean removeOnRPCNotificationListener(FunctionID notificationId, OnRPCNotificationListener listener) {return false;}
 
 		@Override
+		public void addOnRPCListener(FunctionID responseId, OnRPCListener listener) { }
+
+		@Override
+		public boolean removeOnRPCListener(FunctionID responseId, OnRPCListener listener) { return false; }
+
+		@Override
 		public Object getCapability(SystemCapabilityType systemCapabilityType){return null;}
 
 		@Override
@@ -200,6 +207,12 @@ public class SystemCapabilityManagerTests extends AndroidTestCase {
 		}
 
 		@Override
+		public void addOnSystemCapabilityListener(SystemCapabilityType systemCapabilityType, OnSystemCapabilityListener listener) { }
+
+		@Override
+		public boolean removeOnSystemCapabilityListener(SystemCapabilityType systemCapabilityType, OnSystemCapabilityListener listener) { return false; }
+
+		@Override
 		public void startAudioService(boolean isEncrypted, AudioStreamingCodec codec,
 									  AudioStreamingParams params) {}
 
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MassageCushionFirmnessTest.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MassageCushionFirmnessTest.java
new file mode 100644
index 000000000..da8a7cbfe
--- /dev/null
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MassageCushionFirmnessTest.java
@@ -0,0 +1,71 @@
+package com.smartdevicelink.test.rpc.datatypes;
+
+import com.smartdevicelink.proxy.rpc.MassageCushionFirmness;
+import com.smartdevicelink.proxy.rpc.enums.MassageCushion;
+import com.smartdevicelink.test.JsonUtils;
+import com.smartdevicelink.test.Test;
+
+import junit.framework.TestCase;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.Iterator;
+
+/**
+ * This is a unit test class for the SmartDeviceLink library project class :
+ * {@link com.smartdevicelink.rpc.MassageCushionFirmness}
+ */
+public class MassageCushionFirmnessTest extends TestCase {
+
+	private MassageCushionFirmness msg;
+
+	@Override
+	public void setUp() {
+		msg = new MassageCushionFirmness();
+
+		msg.setCushion(Test.GENERAL_MASSAGECUSHION);
+		msg.setFirmness(Test.GENERAL_INT);
+	}
+
+	/**
+	 * Tests the expected values of the RPC message.
+	 */
+	public void testRpcValues() {
+		// Test Values
+		MassageCushion cushion = msg.getCushion();
+		Integer firmness = msg.getFirmness();
+
+		// Valid Tests
+		assertEquals(Test.MATCH, Test.GENERAL_MASSAGECUSHION, cushion);
+		assertEquals(Test.MATCH, (Integer) Test.GENERAL_INT, firmness);
+
+		// Invalid/Null Tests
+		MassageCushionFirmness msg = new MassageCushionFirmness();
+		assertNotNull(Test.NOT_NULL, msg);
+
+		assertNull(Test.NULL, msg.getCushion());
+		assertNull(Test.NULL, msg.getFirmness());
+	}
+
+	public void testJson() {
+		JSONObject reference = new JSONObject();
+
+		try {
+			reference.put(MassageCushionFirmness.KEY_CUSHION, Test.GENERAL_MASSAGECUSHION);
+			reference.put(MassageCushionFirmness.KEY_FIRMNESS, Test.GENERAL_INT);
+
+			JSONObject underTest = msg.serializeJSON();
+			assertEquals(Test.MATCH, reference.length(), underTest.length());
+
+			Iterator<?> iterator = reference.keys();
+			while (iterator.hasNext()) {
+				String key = (String) iterator.next();
+
+				assertEquals(Test.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
+			}
+		} catch (JSONException e) {
+			fail(Test.JSON_FAIL);
+		}
+	}
+}
\ No newline at end of file
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MassageModeDataTest.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MassageModeDataTest.java
new file mode 100644
index 000000000..958de9fa2
--- /dev/null
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MassageModeDataTest.java
@@ -0,0 +1,74 @@
+package com.smartdevicelink.test.rpc.datatypes;
+
+import com.smartdevicelink.proxy.rpc.MassageModeData;
+import com.smartdevicelink.proxy.rpc.enums.MassageMode;
+import com.smartdevicelink.proxy.rpc.enums.MassageZone;
+import com.smartdevicelink.test.JsonUtils;
+import com.smartdevicelink.test.Test;
+
+import junit.framework.TestCase;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.Iterator;
+
+/**
+ * This is a unit test class for the SmartDeviceLink library project class :
+ * {@link com.smartdevicelink.rpc.MassageModeData}
+ */
+public class MassageModeDataTest extends TestCase {
+
+	private MassageModeData msg;
+
+	@Override
+	public void setUp() {
+		msg = new MassageModeData();
+
+		msg.setMassageZone(Test.GENERAL_MASSAGEZONE);
+		msg.setMassageMode(Test.GENERAL_MASSAGEMODE);
+	}
+
+	/**
+	 * Tests the expected values of the RPC message.
+	 */
+	public void testRpcValues() {
+		// Test Values
+		MassageZone massageZone = msg.getMassageZone();
+		MassageMode massageMode = msg.getMassageMode();
+
+		// Valid Tests
+		assertEquals(Test.MATCH, Test.GENERAL_MASSAGEZONE, massageZone);
+		assertEquals(Test.MATCH, Test.GENERAL_MASSAGEMODE, massageMode);
+
+
+		// Invalid/Null Tests
+		MassageModeData msg = new MassageModeData();
+		assertNotNull(Test.NOT_NULL, msg);
+
+		assertNull(Test.NULL, msg.getMassageMode());
+		assertNull(Test.NULL, msg.getMassageZone());
+	}
+
+	public void testJson() {
+		JSONObject reference = new JSONObject();
+
+		try {
+			reference.put(MassageModeData.KEY_MASSAGE_MODE, Test.GENERAL_MASSAGEMODE);
+			reference.put(MassageModeData.KEY_MASSAGE_ZONE, Test.GENERAL_MASSAGEZONE);
+
+			JSONObject underTest = msg.serializeJSON();
+			assertEquals(Test.MATCH, reference.length(), underTest.length());
+
+			Iterator<?> iterator = reference.keys();
+			while (iterator.hasNext()) {
+				String key = (String) iterator.next();
+
+				assertEquals(Test.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
+
+			}
+		} catch (JSONException e) {
+			fail(Test.JSON_FAIL);
+		}
+	}
+}
\ No newline at end of file
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ModuleDataTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ModuleDataTests.java
index ea71dfc8a..067216169 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ModuleDataTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ModuleDataTests.java
@@ -4,6 +4,7 @@ import com.smartdevicelink.marshal.JsonRPCMarshaller;
 import com.smartdevicelink.proxy.rpc.ClimateControlData;
 import com.smartdevicelink.proxy.rpc.ModuleData;
 import com.smartdevicelink.proxy.rpc.RadioControlData;
+import com.smartdevicelink.proxy.rpc.SeatControlData;
 import com.smartdevicelink.proxy.rpc.enums.ModuleType;
 import com.smartdevicelink.test.JsonUtils;
 import com.smartdevicelink.test.Test;
@@ -18,78 +19,89 @@ import java.util.Hashtable;
 import java.util.Iterator;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.rpc.ModuleData}
  */
-public class ModuleDataTests extends TestCase{
-	
-    private ModuleData msg;
+public class ModuleDataTests extends TestCase {
 
-    @Override
-    public void setUp(){
-        msg = new ModuleData();
+	private ModuleData msg;
 
-        msg.setModuleType(Test.GENERAL_MODULETYPE);
-        msg.setRadioControlData(Test.GENERAL_RADIOCONTROLDATA);
-        msg.setClimateControlData(Test.GENERAL_CLIMATECONTROLDATA);
-    }
+	@Override
+	public void setUp() {
+		msg = new ModuleData();
 
-    /**
+		msg.setModuleType(Test.GENERAL_MODULETYPE);
+		msg.setRadioControlData(Test.GENERAL_RADIOCONTROLDATA);
+		msg.setClimateControlData(Test.GENERAL_CLIMATECONTROLDATA);
+		msg.setSeatControlData(Test.GENERAL_SEATCONTROLDATA);
+	}
+
+	/**
 	 * Tests the expected values of the RPC message.
 	 */
-    public void testRpcValues () {
-        // Test Values
-        ModuleType moduleType = msg.getModuleType();
-        RadioControlData radioControlData = msg.getRadioControlData();
-        ClimateControlData climateControlData = msg.getClimateControlData();
-
-        // Valid Tests
-        assertEquals(Test.MATCH, Test.GENERAL_MODULETYPE, moduleType);
-        assertTrue(Test.TRUE, Validator.validateRadioControlData(Test.GENERAL_RADIOCONTROLDATA, radioControlData));
-        assertTrue(Test.TRUE, Validator.validateClimateControlData(Test.GENERAL_CLIMATECONTROLDATA, climateControlData));
-
-        // Invalid/Null Tests
-        ModuleData msg = new ModuleData();
-        assertNotNull(Test.NOT_NULL, msg);
-
-        assertNull(Test.NULL, msg.getModuleType());
-        assertNull(Test.NULL, msg.getRadioControlData());
-        assertNull(Test.NULL, msg.getClimateControlData());
-    }
-
-    public void testJson(){
-        JSONObject reference = new JSONObject();
-
-        try{
-            reference.put(ModuleData.KEY_MODULE_TYPE, Test.GENERAL_MODULETYPE);
-            reference.put(ModuleData.KEY_RADIO_CONTROL_DATA, JsonRPCMarshaller.serializeHashtable(Test.GENERAL_RADIOCONTROLDATA.getStore()));
-            reference.put(ModuleData.KEY_CLIMATE_CONTROL_DATA, JsonRPCMarshaller.serializeHashtable(Test.GENERAL_CLIMATECONTROLDATA.getStore()));
-
-            JSONObject underTest = msg.serializeJSON();
-            assertEquals(Test.MATCH, reference.length(), underTest.length());
-
-            Iterator<?> iterator = reference.keys();
-            while(iterator.hasNext()){
-                String key = (String) iterator.next();
-
-                if(key.equals(ModuleData.KEY_RADIO_CONTROL_DATA)){
-                    JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key);
-                    JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
-                    Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals);
-                    Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
-                    assertTrue(Test.TRUE, Validator.validateRadioControlData( new RadioControlData(hashReference), new RadioControlData(hashTest)));
-                } else if(key.equals(ModuleData.KEY_CLIMATE_CONTROL_DATA)){
-                    JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key);
-                    JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
-                    Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals);
-                    Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
-                    assertTrue(Test.TRUE, Validator.validateClimateControlData( new ClimateControlData(hashReference), new ClimateControlData(hashTest)));
-                } else{
-                    assertEquals(Test.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
-                }
-            }
-        } catch(JSONException e){
-        	fail(Test.JSON_FAIL);
-        }
-    }
+	public void testRpcValues() {
+		// Test Values
+		ModuleType moduleType = msg.getModuleType();
+		RadioControlData radioControlData = msg.getRadioControlData();
+		ClimateControlData climateControlData = msg.getClimateControlData();
+		SeatControlData seatControlData = msg.getSeatControlData();
+
+		// Valid Tests
+		assertEquals(Test.MATCH, Test.GENERAL_MODULETYPE, moduleType);
+		assertTrue(Test.TRUE, Validator.validateRadioControlData(Test.GENERAL_RADIOCONTROLDATA, radioControlData));
+		assertTrue(Test.TRUE, Validator.validateClimateControlData(Test.GENERAL_CLIMATECONTROLDATA, climateControlData));
+		assertTrue(Test.TRUE, Validator.validateSeatControlData(Test.GENERAL_SEATCONTROLDATA, seatControlData));
+
+		// Invalid/Null Tests
+		ModuleData msg = new ModuleData();
+		assertNotNull(Test.NOT_NULL, msg);
+
+		assertNull(Test.NULL, msg.getModuleType());
+		assertNull(Test.NULL, msg.getRadioControlData());
+		assertNull(Test.NULL, msg.getClimateControlData());
+		assertNull(Test.NULL, msg.getSeatControlData());
+	}
+
+	public void testJson() {
+		JSONObject reference = new JSONObject();
+
+		try {
+			reference.put(ModuleData.KEY_MODULE_TYPE, Test.GENERAL_MODULETYPE);
+			reference.put(ModuleData.KEY_RADIO_CONTROL_DATA, JsonRPCMarshaller.serializeHashtable(Test.GENERAL_RADIOCONTROLDATA.getStore()));
+			reference.put(ModuleData.KEY_CLIMATE_CONTROL_DATA, JsonRPCMarshaller.serializeHashtable(Test.GENERAL_CLIMATECONTROLDATA.getStore()));
+			reference.put(ModuleData.KEY_SEAT_CONTROL_DATA, JsonRPCMarshaller.serializeHashtable(Test.GENERAL_SEATCONTROLDATA.getStore()));
+
+			JSONObject underTest = msg.serializeJSON();
+			assertEquals(Test.MATCH, reference.length(), underTest.length());
+
+			Iterator<?> iterator = reference.keys();
+			while (iterator.hasNext()) {
+				String key = (String) iterator.next();
+
+				if (key.equals(ModuleData.KEY_RADIO_CONTROL_DATA)) {
+					JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key);
+					JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
+					Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals);
+					Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
+					assertTrue(Test.TRUE, Validator.validateRadioControlData(new RadioControlData(hashReference), new RadioControlData(hashTest)));
+				} else if (key.equals(ModuleData.KEY_CLIMATE_CONTROL_DATA)) {
+					JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key);
+					JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
+					Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals);
+					Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
+					assertTrue(Test.TRUE, Validator.validateClimateControlData(new ClimateControlData(hashReference), new ClimateControlData(hashTest)));
+				} else if (key.equals(ModuleData.KEY_SEAT_CONTROL_DATA)) {
+					JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key);
+					JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
+					Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals);
+					Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
+					assertTrue(Test.TRUE, Validator.validateSeatControlData(new SeatControlData(hashReference), new SeatControlData(hashTest)));
+				} else {
+					assertEquals(Test.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
+				}
+			}
+		} catch (JSONException e) {
+			fail(Test.JSON_FAIL);
+		}
+	}
 }
\ No newline at end of file
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RemoteControlCapabilitiesTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RemoteControlCapabilitiesTests.java
index a15179b8f..6e29f01a3 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RemoteControlCapabilitiesTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RemoteControlCapabilitiesTests.java
@@ -5,6 +5,7 @@ import com.smartdevicelink.proxy.rpc.ButtonCapabilities;
 import com.smartdevicelink.proxy.rpc.ClimateControlCapabilities;
 import com.smartdevicelink.proxy.rpc.RadioControlCapabilities;
 import com.smartdevicelink.proxy.rpc.RemoteControlCapabilities;
+import com.smartdevicelink.proxy.rpc.SeatControlCapabilities;
 import com.smartdevicelink.test.JsonUtils;
 import com.smartdevicelink.test.Test;
 import com.smartdevicelink.test.Validator;
@@ -21,111 +22,125 @@ import java.util.Iterator;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.rpc.RemoteControlCapabilities}
  */
-public class RemoteControlCapabilitiesTests extends TestCase{
-	
-    private RemoteControlCapabilities msg;
+public class RemoteControlCapabilitiesTests extends TestCase {
 
-    @Override
-    public void setUp(){
-        msg = new RemoteControlCapabilities();
+	private RemoteControlCapabilities msg;
 
-        msg.setButtonCapabilities(Test.GENERAL_BUTTONCAPABILITIES_LIST);
-        msg.setRadioControlCapabilities(Test.GENERAL_RADIOCONTROLCAPABILITIES_LIST);
-        msg.setClimateControlCapabilities(Test.GENERAL_CLIMATECONTROLCAPABILITIES_LIST);
-    }
+	@Override
+	public void setUp() {
+		msg = new RemoteControlCapabilities();
 
-    /**
+		msg.setButtonCapabilities(Test.GENERAL_BUTTONCAPABILITIES_LIST);
+		msg.setRadioControlCapabilities(Test.GENERAL_RADIOCONTROLCAPABILITIES_LIST);
+		msg.setClimateControlCapabilities(Test.GENERAL_CLIMATECONTROLCAPABILITIES_LIST);
+		msg.setSeatControlCapabilities(Test.GENERAL_SEATCONTROLCAPABILITIES_LIST);
+	}
+
+	/**
 	 * Tests the expected values of the RPC message.
 	 */
-    public void testRpcValues () {
-        // Test Values
-        List<ButtonCapabilities> buttonCapabilities = msg.getButtonCapabilities();
-        List<RadioControlCapabilities> radioControlCapabilities = msg.getRadioControlCapabilities();
-        List<ClimateControlCapabilities> climateControlCapabilities = msg.getClimateControlCapabilities();
-
-        // Valid Tests
-        assertEquals(Test.MATCH, Test.GENERAL_BUTTONCAPABILITIES_LIST.size(), buttonCapabilities.size());
-        assertEquals(Test.MATCH, Test.GENERAL_RADIOCONTROLCAPABILITIES_LIST.size(), radioControlCapabilities.size());
-        assertEquals(Test.MATCH, Test.GENERAL_CLIMATECONTROLCAPABILITIES_LIST.size(), climateControlCapabilities.size());
-
-        assertTrue(Test.TRUE, Validator.validateButtonCapabilities(Test.GENERAL_BUTTONCAPABILITIES_LIST, buttonCapabilities));
-        assertTrue(Test.TRUE, Validator.validateRadioControlCapabilities(Test.GENERAL_RADIOCONTROLCAPABILITIES_LIST, radioControlCapabilities));
-        assertTrue(Test.TRUE, Validator.validateClimateControlCapabilities(Test.GENERAL_CLIMATECONTROLCAPABILITIES_LIST, climateControlCapabilities));
-
-        // Invalid/Null Tests
-        RemoteControlCapabilities msg = new RemoteControlCapabilities();
-        assertNotNull(Test.NOT_NULL, msg);
-
-        assertNull(Test.NULL, msg.getButtonCapabilities());
-        assertNull(Test.NULL, msg.getRadioControlCapabilities());
-        assertNull(Test.NULL, msg.getClimateControlCapabilities());
-
-    }
-
-    public void testJson(){
-        JSONObject reference = new JSONObject();
-
-        try{
-            reference.put(RemoteControlCapabilities.KEY_BUTTON_CAPABILITIES, Test.JSON_BUTTONCAPABILITIES);
-            reference.put(RemoteControlCapabilities.KEY_RADIO_CONTROL_CAPABILITIES, Test.JSON_RADIOCONTROLCAPABILITIES);
-            reference.put(RemoteControlCapabilities.KEY_CLIMATE_CONTROL_CAPABILITIES, Test.JSON_CLIMATECONTROLCAPABILITIES);
-
-            JSONObject underTest = msg.serializeJSON();
-            assertEquals(Test.MATCH, reference.length(), underTest.length());
-
-            Iterator<?> iterator = reference.keys();
-            while(iterator.hasNext()){
-                String key = (String) iterator.next();
-
-                if(key.equals(RemoteControlCapabilities.KEY_BUTTON_CAPABILITIES)){
-                    JSONArray referenceArray = JsonUtils.readJsonArrayFromJsonObject(reference, key);
-                    JSONArray underTestArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key);
-                    assertEquals(Test.MATCH, referenceArray.length(), underTestArray.length());
-
-                    List<ButtonCapabilities> referenceList = new ArrayList<ButtonCapabilities>();
-                    List<ButtonCapabilities> testList = new ArrayList<ButtonCapabilities>();
-                    for(int i = 0; i < referenceArray.length(); i++){
-                        Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(referenceArray.getJSONObject(i));
-                        referenceList.add(new ButtonCapabilities(hashReference));
-                        Hashtable<String, Object> hashTest= JsonRPCMarshaller.deserializeJSONObject(underTestArray.getJSONObject(i));
-                        testList.add(new ButtonCapabilities(hashTest));
-                    }
-                    assertTrue(Test.TRUE, Validator.validateButtonCapabilities(referenceList, testList));
-                } else if(key.equals(RemoteControlCapabilities.KEY_RADIO_CONTROL_CAPABILITIES)){
-                    JSONArray referenceArray = JsonUtils.readJsonArrayFromJsonObject(reference, key);
-                    JSONArray underTestArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key);
-                    assertEquals(Test.MATCH, referenceArray.length(), underTestArray.length());
-
-                    List<RadioControlCapabilities> referenceList = new ArrayList<RadioControlCapabilities>();
-                    List<RadioControlCapabilities> testList = new ArrayList<RadioControlCapabilities>();
-                    for(int i = 0; i < referenceArray.length(); i++){
-                        Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(referenceArray.getJSONObject(i));
-                        referenceList.add(new RadioControlCapabilities(hashReference));
-                        Hashtable<String, Object> hashTest= JsonRPCMarshaller.deserializeJSONObject(underTestArray.getJSONObject(i));
-                        testList.add(new RadioControlCapabilities(hashTest));
-                    }
-                    assertTrue(Test.TRUE, Validator.validateRadioControlCapabilities(referenceList, testList));
-                } else if(key.equals(RemoteControlCapabilities.KEY_CLIMATE_CONTROL_CAPABILITIES)){
-                    JSONArray referenceArray = JsonUtils.readJsonArrayFromJsonObject(reference, key);
-                    JSONArray underTestArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key);
-                    assertEquals(Test.MATCH, referenceArray.length(), underTestArray.length());
-
-                    List<ClimateControlCapabilities> referenceList = new ArrayList<ClimateControlCapabilities>();
-                    List<ClimateControlCapabilities> testList = new ArrayList<ClimateControlCapabilities>();
-                    for(int i = 0; i < referenceArray.length(); i++){
-                        Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(referenceArray.getJSONObject(i));
-                        referenceList.add(new ClimateControlCapabilities(hashReference));
-                        Hashtable<String, Object> hashTest= JsonRPCMarshaller.deserializeJSONObject(underTestArray.getJSONObject(i));
-                        testList.add(new ClimateControlCapabilities(hashTest));
-                    }
-                    assertTrue(Test.TRUE, Validator.validateClimateControlCapabilities(referenceList, testList));
-                }
-            }
-        } catch(JSONException e){
-        	fail(Test.JSON_FAIL);
-        }
-    }
+	public void testRpcValues() {
+		// Test Values
+		List<ButtonCapabilities> buttonCapabilities = msg.getButtonCapabilities();
+		List<RadioControlCapabilities> radioControlCapabilities = msg.getRadioControlCapabilities();
+		List<ClimateControlCapabilities> climateControlCapabilities = msg.getClimateControlCapabilities();
+		List<SeatControlCapabilities> seatControlCapabilities = msg.getSeatControlCapabilities();
+
+		// Valid Tests
+		assertEquals(Test.MATCH, Test.GENERAL_BUTTONCAPABILITIES_LIST.size(), buttonCapabilities.size());
+		assertEquals(Test.MATCH, Test.GENERAL_RADIOCONTROLCAPABILITIES_LIST.size(), radioControlCapabilities.size());
+		assertEquals(Test.MATCH, Test.GENERAL_CLIMATECONTROLCAPABILITIES_LIST.size(), climateControlCapabilities.size());
+		assertEquals(Test.MATCH, Test.GENERAL_SEATCONTROLCAPABILITIES_LIST.size(), seatControlCapabilities.size());
+
+		assertTrue(Test.TRUE, Validator.validateButtonCapabilities(Test.GENERAL_BUTTONCAPABILITIES_LIST, buttonCapabilities));
+		assertTrue(Test.TRUE, Validator.validateRadioControlCapabilities(Test.GENERAL_RADIOCONTROLCAPABILITIES_LIST, radioControlCapabilities));
+		assertTrue(Test.TRUE, Validator.validateClimateControlCapabilities(Test.GENERAL_CLIMATECONTROLCAPABILITIES_LIST, climateControlCapabilities));
+
+		assertTrue(Test.TRUE, Validator.validateSeatControlCapabilitiesList(Test.GENERAL_SEATCONTROLCAPABILITIES_LIST, seatControlCapabilities));
+
+		// Invalid/Null Tests
+		RemoteControlCapabilities msg = new RemoteControlCapabilities();
+		assertNotNull(Test.NOT_NULL, msg);
+
+		assertNull(Test.NULL, msg.getButtonCapabilities());
+		assertNull(Test.NULL, msg.getRadioControlCapabilities());
+		assertNull(Test.NULL, msg.getClimateControlCapabilities());
+		assertNull(Test.NULL, msg.getSeatControlCapabilities());
+
+	}
+
+	public void testJson() {
+		JSONObject reference = new JSONObject();
+
+		try {
+			reference.put(RemoteControlCapabilities.KEY_BUTTON_CAPABILITIES, Test.JSON_BUTTONCAPABILITIES);
+			reference.put(RemoteControlCapabilities.KEY_RADIO_CONTROL_CAPABILITIES, Test.JSON_RADIOCONTROLCAPABILITIES);
+			reference.put(RemoteControlCapabilities.KEY_CLIMATE_CONTROL_CAPABILITIES, Test.JSON_CLIMATECONTROLCAPABILITIES);
+			reference.put(RemoteControlCapabilities.KEY_SEAT_CONTROL_CAPABILITIES, Test.GENERAL_SEATCONTROLCAPABILITIES_LIST);
+
+			JSONObject underTest = msg.serializeJSON();
+			assertEquals(Test.MATCH, reference.length(), underTest.length());
+
+			Iterator<?> iterator = reference.keys();
+			while (iterator.hasNext()) {
+				String key = (String) iterator.next();
+
+				if (key.equals(RemoteControlCapabilities.KEY_BUTTON_CAPABILITIES)) {
+					JSONArray referenceArray = JsonUtils.readJsonArrayFromJsonObject(reference, key);
+					JSONArray underTestArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key);
+					assertEquals(Test.MATCH, referenceArray.length(), underTestArray.length());
+
+					List<ButtonCapabilities> referenceList = new ArrayList<ButtonCapabilities>();
+					List<ButtonCapabilities> testList = new ArrayList<ButtonCapabilities>();
+					for (int i = 0; i < referenceArray.length(); i++) {
+						Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(referenceArray.getJSONObject(i));
+						referenceList.add(new ButtonCapabilities(hashReference));
+						Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(underTestArray.getJSONObject(i));
+						testList.add(new ButtonCapabilities(hashTest));
+					}
+					assertTrue(Test.TRUE, Validator.validateButtonCapabilities(referenceList, testList));
+				} else if (key.equals(RemoteControlCapabilities.KEY_RADIO_CONTROL_CAPABILITIES)) {
+					JSONArray referenceArray = JsonUtils.readJsonArrayFromJsonObject(reference, key);
+					JSONArray underTestArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key);
+					assertEquals(Test.MATCH, referenceArray.length(), underTestArray.length());
+
+					List<RadioControlCapabilities> referenceList = new ArrayList<RadioControlCapabilities>();
+					List<RadioControlCapabilities> testList = new ArrayList<RadioControlCapabilities>();
+					for (int i = 0; i < referenceArray.length(); i++) {
+						Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(referenceArray.getJSONObject(i));
+						referenceList.add(new RadioControlCapabilities(hashReference));
+						Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(underTestArray.getJSONObject(i));
+						testList.add(new RadioControlCapabilities(hashTest));
+					}
+					assertTrue(Test.TRUE, Validator.validateRadioControlCapabilities(referenceList, testList));
+				} else if (key.equals(RemoteControlCapabilities.KEY_CLIMATE_CONTROL_CAPABILITIES)) {
+					JSONArray referenceArray = JsonUtils.readJsonArrayFromJsonObject(reference, key);
+					JSONArray underTestArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key);
+					assertEquals(Test.MATCH, referenceArray.length(), underTestArray.length());
+
+					List<ClimateControlCapabilities> referenceList = new ArrayList<ClimateControlCapabilities>();
+					List<ClimateControlCapabilities> testList = new ArrayList<ClimateControlCapabilities>();
+					for (int i = 0; i < referenceArray.length(); i++) {
+						Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(referenceArray.getJSONObject(i));
+						referenceList.add(new ClimateControlCapabilities(hashReference));
+						Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(underTestArray.getJSONObject(i));
+						testList.add(new ClimateControlCapabilities(hashTest));
+					}
+					assertTrue(Test.TRUE, Validator.validateClimateControlCapabilities(referenceList, testList));
+				} else if (key.equals(RemoteControlCapabilities.KEY_SEAT_CONTROL_CAPABILITIES)) {
+					List<SeatControlCapabilities> sccReference = (List<SeatControlCapabilities>) JsonUtils.readObjectFromJsonObject(reference, key);
+					JSONArray sccArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key);
+					int i = 0;
+					for (SeatControlCapabilities scc : sccReference) {
+						assertTrue(Validator.validateSeatControlCapabilities(scc, new SeatControlCapabilities(JsonRPCMarshaller.deserializeJSONObject(sccArray.getJSONObject(i++)))));
+					}
+				}
+			}
+		} catch (JSONException e) {
+			fail(Test.JSON_FAIL);
+		}
+	}
 }
\ No newline at end of file
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatControlCapabilitiesTest.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatControlCapabilitiesTest.java
new file mode 100644
index 000000000..d988fa991
--- /dev/null
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatControlCapabilitiesTest.java
@@ -0,0 +1,141 @@
+package com.smartdevicelink.test.rpc.datatypes;
+
+import com.smartdevicelink.proxy.rpc.SeatControlCapabilities;
+import com.smartdevicelink.test.JsonUtils;
+import com.smartdevicelink.test.Test;
+
+import junit.framework.TestCase;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.Iterator;
+
+/**
+ * This is a unit test class for the SmartDeviceLink library project class :
+ * {@link com.smartdevicelink.rpc.SeatControlCapabilities}
+ */
+public class SeatControlCapabilitiesTest extends TestCase {
+
+	private SeatControlCapabilities msg;
+
+	@Override
+	public void setUp() {
+		msg = new SeatControlCapabilities();
+		msg.setModuleName(Test.GENERAL_STRING);
+		msg.setHeatingEnabledAvailable(Test.GENERAL_BOOLEAN);
+		msg.setCoolingEnabledAvailable(Test.GENERAL_BOOLEAN);
+		msg.setHeatingLevelAvailable(Test.GENERAL_BOOLEAN);
+		msg.setCoolingLevelAvailable(Test.GENERAL_BOOLEAN);
+		msg.setHorizontalPositionAvailable(Test.GENERAL_BOOLEAN);
+		msg.setVerticalPositionAvailable(Test.GENERAL_BOOLEAN);
+		msg.setFrontVerticalPositionAvailable(Test.GENERAL_BOOLEAN);
+		msg.setBackVerticalPositionAvailable(Test.GENERAL_BOOLEAN);
+		msg.setBackTiltAngleAvailable(Test.GENERAL_BOOLEAN);
+		msg.setHeadSupportVerticalPositionAvailable(Test.GENERAL_BOOLEAN);
+		msg.setHeadSupportHorizontalPositionAvailable(Test.GENERAL_BOOLEAN);
+		msg.setMassageEnabledAvailable(Test.GENERAL_BOOLEAN);
+		msg.setMassageModeAvailable(Test.GENERAL_BOOLEAN);
+		msg.setMassageCushionFirmnessAvailable(Test.GENERAL_BOOLEAN);
+		msg.setMemoryAvailable(Test.GENERAL_BOOLEAN);
+	}
+
+	/**
+	 * Tests the expected values of the RPC message.
+	 */
+	public void testRpcValues() {
+		// Test Values
+		String moduleName = msg.getModuleName();
+		Boolean heatingEnabledAvailable = msg.getHeatingEnabledAvailable();
+		Boolean coolingEnabledAvailable = msg.getCoolingEnabledAvailable();
+		Boolean heatingLevelAvailable = msg.getHeatingLevelAvailable();
+		Boolean coolingLevelAvailable = msg.getCoolingLevelAvailable();
+		Boolean horizontalPositionAvailable = msg.getHorizontalPositionAvailable();
+		Boolean verticalPositionAvailable = msg.getVerticalPositionAvailable();
+		Boolean frontVerticalPositionAvailable = msg.getFrontVerticalPositionAvailable();
+		Boolean backVerticalPositionAvailable = msg.getBackVerticalPositionAvailable();
+		Boolean backTiltAngleAvailable = msg.getBackTiltAngleAvailable();
+		Boolean headSupportHorizontalPositionAvailable = msg.getHeadSupportHorizontalPositionAvailable();
+		Boolean headSupportVerticalPositionAvailable = msg.getHeadSupportVerticalPositionAvailable();
+		Boolean massageEnabledAvailable = msg.getMassageEnabledAvailable();
+		Boolean massageModeAvailable = msg.getMassageModeAvailable();
+		Boolean massageCushionFirmnessAvailable = msg.getMassageCushionFirmnessAvailable();
+
+		Boolean memoryAvailable = msg.getMemoryAvailable();
+
+		// Valid Tests
+		assertEquals(Test.MATCH, Test.GENERAL_STRING, moduleName);
+		assertEquals(Test.MATCH, (Boolean) Test.GENERAL_BOOLEAN, heatingEnabledAvailable);
+		assertEquals(Test.MATCH, (Boolean) Test.GENERAL_BOOLEAN, coolingEnabledAvailable);
+		assertEquals(Test.MATCH, (Boolean) Test.GENERAL_BOOLEAN, heatingLevelAvailable);
+		assertEquals(Test.MATCH, (Boolean) Test.GENERAL_BOOLEAN, coolingLevelAvailable);
+		assertEquals(Test.MATCH, (Boolean) Test.GENERAL_BOOLEAN, horizontalPositionAvailable);
+		assertEquals(Test.MATCH, (Boolean) Test.GENERAL_BOOLEAN, verticalPositionAvailable);
+		assertEquals(Test.MATCH, (Boolean) Test.GENERAL_BOOLEAN, frontVerticalPositionAvailable);
+		assertEquals(Test.MATCH, (Boolean) Test.GENERAL_BOOLEAN, backVerticalPositionAvailable);
+		assertEquals(Test.MATCH, (Boolean) Test.GENERAL_BOOLEAN, backTiltAngleAvailable);
+		assertEquals(Test.MATCH, (Boolean) Test.GENERAL_BOOLEAN, headSupportHorizontalPositionAvailable);
+		assertEquals(Test.MATCH, (Boolean) Test.GENERAL_BOOLEAN, headSupportVerticalPositionAvailable);
+		assertEquals(Test.MATCH, (Boolean) Test.GENERAL_BOOLEAN, massageEnabledAvailable);
+		assertEquals(Test.MATCH, (Boolean) Test.GENERAL_BOOLEAN, massageModeAvailable);
+		assertEquals(Test.MATCH, (Boolean) Test.GENERAL_BOOLEAN, massageCushionFirmnessAvailable);
+		assertEquals(Test.MATCH, (Boolean) Test.GENERAL_BOOLEAN, memoryAvailable);
+
+		// Invalid/Null Tests
+		SeatControlCapabilities msg = new SeatControlCapabilities();
+		assertNotNull(Test.NOT_NULL, msg);
+
+		assertNull(Test.NULL, msg.getModuleName());
+		assertNull(Test.NULL, msg.getHeatingEnabledAvailable());
+		assertNull(Test.NULL, msg.getCoolingEnabledAvailable());
+		assertNull(Test.NULL, msg.getHeatingLevelAvailable());
+		assertNull(Test.NULL, msg.getCoolingLevelAvailable());
+		assertNull(Test.NULL, msg.getHorizontalPositionAvailable());
+		assertNull(Test.NULL, msg.getVerticalPositionAvailable());
+		assertNull(Test.NULL, msg.getFrontVerticalPositionAvailable());
+		assertNull(Test.NULL, msg.getBackVerticalPositionAvailable());
+		assertNull(Test.NULL, msg.getBackTiltAngleAvailable());
+		assertNull(Test.NULL, msg.getHeadSupportHorizontalPositionAvailable());
+		assertNull(Test.NULL, msg.getHeadSupportVerticalPositionAvailable());
+		assertNull(Test.NULL, msg.getMassageEnabledAvailable());
+		assertNull(Test.NULL, msg.getMassageModeAvailable());
+		assertNull(Test.NULL, msg.getMassageCushionFirmnessAvailable());
+		assertNull(Test.NULL, msg.getMemoryAvailable());
+	}
+
+	public void testJson() {
+		JSONObject reference = new JSONObject();
+
+		try {
+			reference.put(SeatControlCapabilities.KEY_MODULE_NAME, Test.GENERAL_STRING);
+			reference.put(SeatControlCapabilities.KEY_HEATING_ENABLED_AVAILABLE, Test.GENERAL_BOOLEAN);
+			reference.put(SeatControlCapabilities.KEY_COOLING_ENABLED_AVAILABLE, Test.GENERAL_BOOLEAN);
+			reference.put(SeatControlCapabilities.KEY_HEATING_LEVEL_AVAILABLE, Test.GENERAL_BOOLEAN);
+			reference.put(SeatControlCapabilities.KEY_COOLING_LEVEL_AVAILABLE, Test.GENERAL_BOOLEAN);
+			reference.put(SeatControlCapabilities.KEY_HORIZONTAL_POSITION_AVAILABLE, Test.GENERAL_BOOLEAN);
+			reference.put(SeatControlCapabilities.KEY_VERTICAL_POSITION_AVAILABLE, Test.GENERAL_BOOLEAN);
+			reference.put(SeatControlCapabilities.KEY_FRONT_VERTICAL_POSITION_AVAILABLE, Test.GENERAL_BOOLEAN);
+			reference.put(SeatControlCapabilities.KEY_BACK_VERTICAL_POSITION_AVAILABLE, Test.GENERAL_BOOLEAN);
+			reference.put(SeatControlCapabilities.KEY_BACK_TILT_ANGLE_AVAILABLE, Test.GENERAL_BOOLEAN);
+			reference.put(SeatControlCapabilities.KEY_HEAD_SUPPORT_HORIZONTAL_POSITION_AVAILABLE, Test.GENERAL_BOOLEAN);
+			reference.put(SeatControlCapabilities.KEY_HEAD_SUPPORT_VERTICAL_POSITION_AVAILABLE, Test.GENERAL_BOOLEAN);
+			reference.put(SeatControlCapabilities.KEY_MASSAGE_ENABLED_AVAILABLE, Test.GENERAL_BOOLEAN);
+
+			reference.put(SeatControlCapabilities.KEY_MASSAGE_MODE_AVAILABLE, Test.GENERAL_BOOLEAN);
+			reference.put(SeatControlCapabilities.KEY_MASSAGE_CUSHION_FIRMNESS_AVAILABLE, Test.GENERAL_BOOLEAN);
+
+			reference.put(SeatControlCapabilities.KEY_MEMORY_AVAILABLE, Test.GENERAL_BOOLEAN);
+
+			JSONObject underTest = msg.serializeJSON();
+			assertEquals(Test.MATCH, reference.length(), underTest.length());
+
+			Iterator<?> iterator = reference.keys();
+			while (iterator.hasNext()) {
+				String key = (String) iterator.next();
+				assertEquals(Test.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
+			}
+		} catch (JSONException e) {
+			fail(Test.JSON_FAIL);
+		}
+	}
+}
\ No newline at end of file
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatControlDataTest.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatControlDataTest.java
new file mode 100644
index 000000000..535e7cf3e
--- /dev/null
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatControlDataTest.java
@@ -0,0 +1,173 @@
+package com.smartdevicelink.test.rpc.datatypes;
+
+import com.smartdevicelink.marshal.JsonRPCMarshaller;
+import com.smartdevicelink.proxy.rpc.MassageCushionFirmness;
+import com.smartdevicelink.proxy.rpc.MassageModeData;
+import com.smartdevicelink.proxy.rpc.SeatControlData;
+import com.smartdevicelink.proxy.rpc.SeatMemoryAction;
+import com.smartdevicelink.proxy.rpc.enums.SupportedSeat;
+import com.smartdevicelink.test.JsonUtils;
+import com.smartdevicelink.test.Test;
+import com.smartdevicelink.test.Validator;
+
+import junit.framework.TestCase;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * This is a unit test class for the SmartDeviceLink library project class :
+ * {@link com.smartdevicelink.rpc.SeatControlData}
+ */
+public class SeatControlDataTest extends TestCase {
+
+	private SeatControlData msg;
+
+	@Override
+	public void setUp() {
+		msg = new SeatControlData();
+		msg.setId(Test.GENERAL_SUPPORTEDSEAT);
+		msg.setHeatingEnabled(Test.GENERAL_BOOLEAN);
+		msg.setCoolingEnabled(Test.GENERAL_BOOLEAN);
+		msg.setHeatingLevel(Test.GENERAL_INT);
+		msg.setCoolingLevel(Test.GENERAL_INT);
+		msg.setHorizontalPosition(Test.GENERAL_INT);
+		msg.setVerticalPosition(Test.GENERAL_INT);
+		msg.setFrontVerticalPosition(Test.GENERAL_INT);
+		msg.setBackVerticalPosition(Test.GENERAL_INT);
+		msg.setBackTiltAngle(Test.GENERAL_INT);
+		msg.setHeadSupportVerticalPosition(Test.GENERAL_INT);
+		msg.setHeadSupportHorizontalPosition(Test.GENERAL_INT);
+		msg.setMassageEnabled(Test.GENERAL_BOOLEAN);
+		msg.setMassageMode(Test.GENERAL_MASSAGEMODEDATA_LIST);
+		msg.setMassageCushionFirmness(Test.GENERAL_MASSAGECUSHIONFIRMNESS_LIST);
+		msg.setMemory(Test.GENERAL_SEATMEMORYACTION);
+	}
+
+	/**
+	 * Tests the expected values of the RPC message.
+	 */
+	public void testRpcValues() {
+		// Test Values
+		SupportedSeat id = msg.getId();
+		Boolean heatingEnabled = msg.getHeatingEnabled();
+		Boolean coolingEnabled = msg.getCoolingEnabled();
+		Integer heatingLevel = msg.getHeatingLevel();
+		Integer coolingLevel = msg.getCoolingLevel();
+		Integer horizontalPosition = msg.getHorizontalPosition();
+		Integer verticalPosition = msg.getVerticalPosition();
+		Integer frontVerticalPosition = msg.getFrontVerticalPosition();
+		Integer backVerticalPosition = msg.getBackVerticalPosition();
+		Integer backTiltAngle = msg.getBackTiltAngle();
+		Integer headSupportHorizontalPosition = msg.getHeadSupportHorizontalPosition();
+		Integer headSupportVerticalPosition = msg.getHeadSupportVerticalPosition();
+		Boolean massageEnabled = msg.getMassageEnabled();
+
+		List<MassageModeData> massageMode = msg.getMassageMode();
+		List<MassageCushionFirmness> massageCushionFirmness = msg.getMassageCushionFirmness();
+		SeatMemoryAction memory = msg.getMemory();
+
+		// Valid Tests
+		assertEquals(Test.MATCH, Test.GENERAL_SUPPORTEDSEAT, id);
+		assertEquals(Test.MATCH, (Boolean) Test.GENERAL_BOOLEAN, heatingEnabled);
+		assertEquals(Test.MATCH, (Boolean) Test.GENERAL_BOOLEAN, coolingEnabled);
+		assertEquals(Test.MATCH, (Integer) Test.GENERAL_INT, heatingLevel);
+		assertEquals(Test.MATCH, (Integer) Test.GENERAL_INT, coolingLevel);
+		assertEquals(Test.MATCH, (Integer) Test.GENERAL_INT, horizontalPosition);
+		assertEquals(Test.MATCH, (Integer) Test.GENERAL_INT, verticalPosition);
+		assertEquals(Test.MATCH, (Integer) Test.GENERAL_INT, frontVerticalPosition);
+		assertEquals(Test.MATCH, (Integer) Test.GENERAL_INT, backVerticalPosition);
+		assertEquals(Test.MATCH, (Integer) Test.GENERAL_INT, backTiltAngle);
+		assertEquals(Test.MATCH, (Integer) Test.GENERAL_INT, headSupportHorizontalPosition);
+		assertEquals(Test.MATCH, (Integer) Test.GENERAL_INT, headSupportVerticalPosition);
+		assertEquals(Test.MATCH, (Boolean) Test.GENERAL_BOOLEAN, massageEnabled);
+
+		assertTrue(Test.TRUE, Validator.validateMassageModeDataList(Test.GENERAL_MASSAGEMODEDATA_LIST, massageMode));
+		assertTrue(Test.TRUE, Validator.validateMassageCushionFirmnessList(Test.GENERAL_MASSAGECUSHIONFIRMNESS_LIST, massageCushionFirmness));
+
+		assertTrue(Test.TRUE, Validator.validateSeatMemoryAction(Test.GENERAL_SEATMEMORYACTION, memory));
+
+		// Invalid/Null Tests
+		SeatControlData msg = new SeatControlData();
+		assertNotNull(Test.NOT_NULL, msg);
+
+		assertNull(Test.NULL, msg.getId());
+		assertNull(Test.NULL, msg.getHeatingEnabled());
+		assertNull(Test.NULL, msg.getCoolingEnabled());
+		assertNull(Test.NULL, msg.getHeatingLevel());
+		assertNull(Test.NULL, msg.getCoolingLevel());
+		assertNull(Test.NULL, msg.getHorizontalPosition());
+		assertNull(Test.NULL, msg.getVerticalPosition());
+		assertNull(Test.NULL, msg.getFrontVerticalPosition());
+		assertNull(Test.NULL, msg.getBackVerticalPosition());
+		assertNull(Test.NULL, msg.getBackTiltAngle());
+		assertNull(Test.NULL, msg.getHeadSupportHorizontalPosition());
+		assertNull(Test.NULL, msg.getHeadSupportVerticalPosition());
+		assertNull(Test.NULL, msg.getMassageEnabled());
+		assertNull(Test.NULL, msg.getMassageMode());
+		assertNull(Test.NULL, msg.getMassageCushionFirmness());
+		assertNull(Test.NULL, msg.getMemory());
+	}
+
+	public void testJson() {
+		JSONObject reference = new JSONObject();
+
+		try {
+			reference.put(SeatControlData.KEY_ID, Test.GENERAL_SUPPORTEDSEAT);
+			reference.put(SeatControlData.KEY_HEATING_ENABLED, Test.GENERAL_BOOLEAN);
+			reference.put(SeatControlData.KEY_COOLING_ENABLED, Test.GENERAL_BOOLEAN);
+			reference.put(SeatControlData.KEY_HEATING_LEVEL, Test.GENERAL_INT);
+			reference.put(SeatControlData.KEY_COOLING_LEVEL, Test.GENERAL_INT);
+			reference.put(SeatControlData.KEY_HORIZONTAL_POSITION, Test.GENERAL_INT);
+			reference.put(SeatControlData.KEY_VERTICAL_POSITION, Test.GENERAL_INT);
+			reference.put(SeatControlData.KEY_FRONT_VERTICAL_POSITION, Test.GENERAL_INT);
+			reference.put(SeatControlData.KEY_BACK_VERTICAL_POSITION, Test.GENERAL_INT);
+			reference.put(SeatControlData.KEY_BACK_TILT_ANGLE, Test.GENERAL_INT);
+			reference.put(SeatControlData.KEY_HEAD_SUPPORT_HORIZONTAL_POSITION, Test.GENERAL_INT);
+			reference.put(SeatControlData.KEY_HEAD_SUPPORT_VERTICAL_POSITION, Test.GENERAL_INT);
+			reference.put(SeatControlData.KEY_MASSAGE_ENABLED, Test.GENERAL_BOOLEAN);
+
+			reference.put(SeatControlData.KEY_MASSAGE_MODE, Test.GENERAL_MASSAGEMODEDATA_LIST);
+			reference.put(SeatControlData.KEY_MASSAGE_CUSHION_FIRMNESS, Test.GENERAL_MASSAGECUSHIONFIRMNESS_LIST);
+
+			reference.put(SeatControlData.KEY_MEMORY, Test.GENERAL_SEATMEMORYACTION);
+
+			JSONObject underTest = msg.serializeJSON();
+			assertEquals(Test.MATCH, reference.length(), underTest.length());
+
+			Iterator<?> iterator = reference.keys();
+			while (iterator.hasNext()) {
+				String key = (String) iterator.next();
+
+				if (key.equals(SeatControlData.KEY_MASSAGE_MODE)) {
+					List<MassageModeData> mmdReference = (List<MassageModeData>) JsonUtils.readObjectFromJsonObject(reference, key);
+					JSONArray mmdArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key);
+					int i = 0;
+					for (MassageModeData mmd : mmdReference) {
+						assertTrue(Validator.validateMassageModeData(mmd, new MassageModeData(JsonRPCMarshaller.deserializeJSONObject(mmdArray.getJSONObject(i++)))));
+					}
+				} else if (key.equals(SeatControlData.KEY_MASSAGE_CUSHION_FIRMNESS)) {
+					List<MassageCushionFirmness> mcfReference = (List<MassageCushionFirmness>) JsonUtils.readObjectFromJsonObject(reference, key);
+					JSONArray mcfArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key);
+					int i = 0;
+					for (MassageCushionFirmness mcf : mcfReference) {
+						assertTrue(Validator.validateMassageCushionFirmness(mcf, new MassageCushionFirmness(JsonRPCMarshaller.deserializeJSONObject(mcfArray.getJSONObject(i++)))));
+					}
+				} else if (key.equals(SeatControlData.KEY_MEMORY)) {
+					SeatMemoryAction mReference = (SeatMemoryAction) JsonUtils.readObjectFromJsonObject(reference, key);
+					Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(JsonUtils.readJsonObjectFromJsonObject(underTest, key));
+					assertTrue(Validator.validateSeatMemoryAction(mReference, new SeatMemoryAction(hashTest)));
+				} else {
+					assertEquals(Test.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
+				}
+			}
+		} catch (JSONException e) {
+			fail(Test.JSON_FAIL);
+		}
+	}
+}
\ No newline at end of file
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatMemoryActionTest.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatMemoryActionTest.java
new file mode 100644
index 000000000..a8c17cee3
--- /dev/null
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatMemoryActionTest.java
@@ -0,0 +1,75 @@
+package com.smartdevicelink.test.rpc.datatypes;
+
+import com.smartdevicelink.proxy.rpc.SeatMemoryAction;
+import com.smartdevicelink.proxy.rpc.enums.SeatMemoryActionType;
+import com.smartdevicelink.test.JsonUtils;
+import com.smartdevicelink.test.Test;
+
+import junit.framework.TestCase;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.Iterator;
+
+/**
+ * This is a unit test class for the SmartDeviceLink library project class :
+ * {@link com.smartdevicelink.rpc.SeatMemoryAction}
+ */
+public class SeatMemoryActionTest extends TestCase {
+
+	private SeatMemoryAction msg;
+
+	@Override
+	public void setUp() {
+		msg = new SeatMemoryAction();
+
+		msg.setId(Test.GENERAL_INT);
+		msg.setLabel(Test.GENERAL_STRING);
+		msg.setAction(Test.GENERAL_SEATMEMORYACTIONTYPE);
+	}
+
+	/**
+	 * Tests the expected values of the RPC message.
+	 */
+	public void testRpcValues() {
+		// Test Values
+		Integer id = msg.getId();
+		String label = msg.getLabel();
+		SeatMemoryActionType action = msg.getAction();
+
+		// Valid Tests
+		assertEquals(Test.MATCH, (Integer) Test.GENERAL_INT, id);
+		assertEquals(Test.MATCH, Test.GENERAL_STRING, label);
+		assertEquals(Test.MATCH, Test.GENERAL_SEATMEMORYACTIONTYPE, action);
+
+		// Invalid/Null Tests
+		SeatMemoryAction msg = new SeatMemoryAction();
+		assertNotNull(Test.NOT_NULL, msg);
+
+		assertNull(Test.NULL, msg.getId());
+		assertNull(Test.NULL, msg.getLabel());
+		assertNull(Test.NULL, msg.getAction());
+	}
+
+	public void testJson() {
+		JSONObject reference = new JSONObject();
+
+		try {
+			reference.put(SeatMemoryAction.KEY_ID, Test.GENERAL_INT);
+			reference.put(SeatMemoryAction.KEY_LABEL, Test.GENERAL_STRING);
+			reference.put(SeatMemoryAction.KEY_ACTION, Test.GENERAL_SEATMEMORYACTIONTYPE);
+
+			JSONObject underTest = msg.serializeJSON();
+			assertEquals(Test.MATCH, reference.length(), underTest.length());
+
+			Iterator<?> iterator = reference.keys();
+			while (iterator.hasNext()) {
+				String key = (String) iterator.next();
+				assertEquals(Test.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
+			}
+		} catch (JSONException e) {
+			fail(Test.JSON_FAIL);
+		}
+	}
+}
\ No newline at end of file
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AudioStreamingIndicatorTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AudioStreamingIndicatorTests.java
new file mode 100644
index 000000000..85312ecde
--- /dev/null
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AudioStreamingIndicatorTests.java
@@ -0,0 +1,80 @@
+package com.smartdevicelink.test.rpc.enums;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import junit.framework.TestCase;
+
+import com.smartdevicelink.proxy.rpc.enums.AudioStreamingIndicator;
+
+/**
+ * This is a unit test class for the SmartDeviceLink library project class :
+ * {@link com.smartdevicelink.proxy.rpc.enums.AudioStreamingIndicator}
+ */
+public class AudioStreamingIndicatorTests extends TestCase {
+
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
+	public void testValidEnums () {
+		String example = "PLAY_PAUSE";
+		AudioStreamingIndicator enumPlayPause = AudioStreamingIndicator.valueForString(example);
+		example = "PLAY";
+		AudioStreamingIndicator enumPlay = AudioStreamingIndicator.valueForString(example);
+		example = "PAUSE";
+		AudioStreamingIndicator enumPause = AudioStreamingIndicator.valueForString(example);
+		example = "STOP";
+		AudioStreamingIndicator enumStop = AudioStreamingIndicator.valueForString(example);
+
+
+		assertNotNull("PLAY_PAUSE returned null", enumPlayPause);
+		assertNotNull("PLAY returned null", enumPlay);
+		assertNotNull("PAUSE returned null", enumPause);
+		assertNotNull("STOP returned null", enumStop);
+	}
+
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
+	public void testInvalidEnum () {
+		String example = "pLayPauZe";
+		try {
+			AudioStreamingIndicator temp = AudioStreamingIndicator.valueForString(example);
+			assertNull("Result of valueForString should be null.", temp);
+		}
+		catch (IllegalArgumentException exception) {
+			fail("Invalid enum throws IllegalArgumentException.");
+		}
+	}
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
+	public void testNullEnum () {
+		String example = null;
+		try {
+			AudioStreamingIndicator temp = AudioStreamingIndicator.valueForString(example);
+			assertNull("Result of valueForString should be null.", temp);
+		}
+		catch (NullPointerException exception) {
+			fail("Null string throws NullPointerException.");
+		}
+	}
+
+	/**
+	 * Verifies the possible enum values of AudioStreamingIndicator.
+	 */
+	public void testListEnum() {
+		List<AudioStreamingIndicator> enumValueList = Arrays.asList(AudioStreamingIndicator.values());
+
+		List<AudioStreamingIndicator> enumTestList = new ArrayList<>();
+		enumTestList.add(AudioStreamingIndicator.PLAY_PAUSE);
+		enumTestList.add(AudioStreamingIndicator.PLAY);
+		enumTestList.add(AudioStreamingIndicator.PAUSE);
+		enumTestList.add(AudioStreamingIndicator.STOP);
+
+		assertTrue("Enum value list does not match enum class list",
+				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
+	}
+}
\ No newline at end of file
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AudioStreamingStateTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AudioStreamingStateTests.java
index ab5972218..178613e53 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AudioStreamingStateTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AudioStreamingStateTests.java
@@ -10,7 +10,7 @@ import com.smartdevicelink.proxy.rpc.enums.AudioStreamingState;
 
 /**
  * This is a unit test class for the SmartDeviceLink library project class : 
- * {@link com.smartdevicelink.rpc.enums.AudioStreaming}
+ * {@link com.smartdevicelink.proxy.rpc.enums.AudioStreamingState}
  */
 public class AudioStreamingStateTests extends TestCase {
 
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ElectronicParkBrakeStatusTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ElectronicParkBrakeStatusTests.java
new file mode 100644
index 000000000..bbeb1bce3
--- /dev/null
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ElectronicParkBrakeStatusTests.java
@@ -0,0 +1,82 @@
+package com.smartdevicelink.test.rpc.enums;
+
+import com.smartdevicelink.proxy.rpc.enums.ElectronicParkBrakeStatus;
+
+import junit.framework.TestCase;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * This is a unit test class for the SmartDeviceLink library project class :
+ * {@link com.smartdevicelink.rpc.enums.ElectronicParkBrakeStatus}
+ */
+public class ElectronicParkBrakeStatusTests extends TestCase {
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
+	public void testValidEnums () {
+		String example = "CLOSED";
+		ElectronicParkBrakeStatus enumClosed = ElectronicParkBrakeStatus.valueForString(example);
+		example = "TRANSITION";
+		ElectronicParkBrakeStatus enumTransition = ElectronicParkBrakeStatus.valueForString(example);
+		example = "OPEN";
+		ElectronicParkBrakeStatus enumOpen = ElectronicParkBrakeStatus.valueForString(example);
+		example = "DRIVE_ACTIVE";
+		ElectronicParkBrakeStatus enumDriveActive = ElectronicParkBrakeStatus.valueForString(example);
+		example = "FAULT";
+		ElectronicParkBrakeStatus enumFault = ElectronicParkBrakeStatus.valueForString(example);
+
+		assertNotNull("CLOSED returned null", enumClosed);
+		assertNotNull("TRANSITION returned null", enumTransition);
+		assertNotNull("OPEN returned null", enumOpen);
+		assertNotNull("DRIVE_ACTIVE returned null", enumDriveActive);
+		assertNotNull("FAULT returned null", enumFault);
+	}
+
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
+	public void testInvalidEnum () {
+		String example = "Clsoed";
+		try {
+			ElectronicParkBrakeStatus temp = ElectronicParkBrakeStatus.valueForString(example);
+			assertNull("Result of valueForString should be null.", temp);
+		}
+		catch (IllegalArgumentException exception) {
+			fail("Invalid enum throws IllegalArgumentException.");
+		}
+	}
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
+	public void testNullEnum () {
+		String example = null;
+		try {
+			ElectronicParkBrakeStatus temp = ElectronicParkBrakeStatus.valueForString(example);
+			assertNull("Result of valueForString should be null.", temp);
+		}
+		catch (NullPointerException exception) {
+			fail("Null string throws NullPointerException.");
+		}
+	}
+
+	/**
+	 * Verifies the possible enum values of Electronic Brake Status.
+	 */
+	public void testListEnum() {
+		List<ElectronicParkBrakeStatus> enumValueList = Arrays.asList(ElectronicParkBrakeStatus.values());
+
+		List<ElectronicParkBrakeStatus> enumTestList = new ArrayList<ElectronicParkBrakeStatus>();
+		enumTestList.add(ElectronicParkBrakeStatus.CLOSED);
+		enumTestList.add(ElectronicParkBrakeStatus.TRANSITION);
+		enumTestList.add(ElectronicParkBrakeStatus.OPEN);
+		enumTestList.add(ElectronicParkBrakeStatus.DRIVE_ACTIVE);
+		enumTestList.add(ElectronicParkBrakeStatus.FAULT);
+
+		assertTrue("Enum value list does not match enum class list",
+				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
+	}
+}
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MassageCushionTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MassageCushionTests.java
new file mode 100644
index 000000000..e1f58ffef
--- /dev/null
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MassageCushionTests.java
@@ -0,0 +1,81 @@
+package com.smartdevicelink.test.rpc.enums;
+
+import com.smartdevicelink.proxy.rpc.enums.MassageCushion;
+
+import junit.framework.TestCase;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * This is a unit test class for the SmartDeviceLink library project class :
+ * {@link com.smartdevicelink.rpc.enums.MassageCushion}
+ */
+public class MassageCushionTests extends TestCase {
+
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
+	public void testValidEnums() {
+		String example = "TOP_LUMBAR";
+		MassageCushion enumTopLumbar = MassageCushion.valueForString(example);
+		example = "MIDDLE_LUMBAR";
+		MassageCushion enumMiddleLumbar = MassageCushion.valueForString(example);
+		example = "BOTTOM_LUMBAR";
+		MassageCushion enumBottomLumbar = MassageCushion.valueForString(example);
+		example = "BACK_BOLSTERS";
+		MassageCushion enumBackBolsters = MassageCushion.valueForString(example);
+		example = "SEAT_BOLSTERS";
+		MassageCushion enumSeatBolsters = MassageCushion.valueForString(example);
+
+		assertNotNull("TOP_LUMBAR returned null", enumTopLumbar);
+		assertNotNull("MIDDLE_LUMBAR returned null", enumMiddleLumbar);
+		assertNotNull("BOTTOM_LUMBAR returned null", enumBottomLumbar);
+		assertNotNull("BACK_BOLSTERS returned null", enumBackBolsters);
+		assertNotNull("SEAT_BOLSTERS returned null", enumSeatBolsters);
+	}
+
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
+	public void testInvalidEnum() {
+		String example = "tOP_LUMBAR";
+		try {
+			MassageCushion temp = MassageCushion.valueForString(example);
+			assertNull("Result of valueForString should be null.", temp);
+		} catch (IllegalArgumentException exception) {
+			fail("Invalid enum throws IllegalArgumentException.");
+		}
+	}
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
+	public void testNullEnum() {
+		String example = null;
+		try {
+			MassageCushion temp = MassageCushion.valueForString(example);
+			assertNull("Result of valueForString should be null.", temp);
+		} catch (NullPointerException exception) {
+			fail("Null string throws NullPointerException.");
+		}
+	}
+
+	/**
+	 * Verifies the possible enum values of MassageCushion.
+	 */
+	public void testListEnum() {
+		List<MassageCushion> enumValueList = Arrays.asList(MassageCushion.values());
+
+		List<MassageCushion> enumTestList = new ArrayList<MassageCushion>();
+		enumTestList.add(MassageCushion.TOP_LUMBAR);
+		enumTestList.add(MassageCushion.MIDDLE_LUMBAR);
+		enumTestList.add(MassageCushion.BOTTOM_LUMBAR);
+		enumTestList.add(MassageCushion.BACK_BOLSTERS);
+		enumTestList.add(MassageCushion.SEAT_BOLSTERS);
+
+		assertTrue("Enum value list does not match enum class list",
+				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
+	}
+}
\ No newline at end of file
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MassageModeTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MassageModeTests.java
new file mode 100644
index 000000000..55e82ac21
--- /dev/null
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MassageModeTests.java
@@ -0,0 +1,73 @@
+package com.smartdevicelink.test.rpc.enums;
+
+import com.smartdevicelink.proxy.rpc.enums.MassageMode;
+
+import junit.framework.TestCase;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * This is a unit test class for the SmartDeviceLink library project class :
+ * {@link com.smartdevicelink.rpc.enums.MassageMode}
+ */
+public class MassageModeTests extends TestCase {
+
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
+	public void testValidEnums() {
+		String example = "OFF";
+		MassageMode enumOff = MassageMode.valueForString(example);
+		example = "LOW";
+		MassageMode enumLow = MassageMode.valueForString(example);
+		example = "HIGH";
+		MassageMode enumHigh = MassageMode.valueForString(example);
+
+		assertNotNull("OFF returned null", enumOff);
+		assertNotNull("LOW returned null", enumLow);
+		assertNotNull("HIGH returned null", enumHigh);
+	}
+
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
+	public void testInvalidEnum() {
+		String example = "oFF";
+		try {
+			MassageMode temp = MassageMode.valueForString(example);
+			assertNull("Result of valueForString should be null.", temp);
+		} catch (IllegalArgumentException exception) {
+			fail("Invalid enum throws IllegalArgumentException.");
+		}
+	}
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
+	public void testNullEnum() {
+		String example = null;
+		try {
+			MassageMode temp = MassageMode.valueForString(example);
+			assertNull("Result of valueForString should be null.", temp);
+		} catch (NullPointerException exception) {
+			fail("Null string throws NullPointerException.");
+		}
+	}
+
+	/**
+	 * Verifies the possible enum values of MassageMode.
+	 */
+	public void testListEnum() {
+		List<MassageMode> enumValueList = Arrays.asList(MassageMode.values());
+
+		List<MassageMode> enumTestList = new ArrayList<MassageMode>();
+		enumTestList.add(MassageMode.OFF);
+		enumTestList.add(MassageMode.LOW);
+		enumTestList.add(MassageMode.HIGH);
+
+		assertTrue("Enum value list does not match enum class list",
+				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
+	}
+}
\ No newline at end of file
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MassageZoneTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MassageZoneTests.java
new file mode 100644
index 000000000..bbd543d4e
--- /dev/null
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MassageZoneTests.java
@@ -0,0 +1,69 @@
+package com.smartdevicelink.test.rpc.enums;
+
+import com.smartdevicelink.proxy.rpc.enums.MassageZone;
+
+import junit.framework.TestCase;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * This is a unit test class for the SmartDeviceLink library project class :
+ * {@link com.smartdevicelink.rpc.enums.MassageZone}
+ */
+public class MassageZoneTests extends TestCase {
+
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
+	public void testValidEnums() {
+		String example = "LUMBAR";
+		MassageZone enumLumbar = MassageZone.valueForString(example);
+		example = "SEAT_CUSHION";
+		MassageZone enumSeatCushion = MassageZone.valueForString(example);
+
+		assertNotNull("LUMBAR returned null", enumLumbar);
+		assertNotNull("SEAT_CUSHION returned null", enumSeatCushion);
+	}
+
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
+	public void testInvalidEnum() {
+		String example = "lUMBAR";
+		try {
+			MassageZone temp = MassageZone.valueForString(example);
+			assertNull("Result of valueForString should be null.", temp);
+		} catch (IllegalArgumentException exception) {
+			fail("Invalid enum throws IllegalArgumentException.");
+		}
+	}
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
+	public void testNullEnum() {
+		String example = null;
+		try {
+			MassageZone temp = MassageZone.valueForString(example);
+			assertNull("Result of valueForString should be null.", temp);
+		} catch (NullPointerException exception) {
+			fail("Null string throws NullPointerException.");
+		}
+	}
+
+	/**
+	 * Verifies the possible enum values of MassageZone.
+	 */
+	public void testListEnum() {
+		List<MassageZone> enumValueList = Arrays.asList(MassageZone.values());
+
+		List<MassageZone> enumTestList = new ArrayList<MassageZone>();
+		enumTestList.add(MassageZone.LUMBAR);
+		enumTestList.add(MassageZone.SEAT_CUSHION);
+
+		assertTrue("Enum value list does not match enum class list",
+				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
+	}
+}
\ No newline at end of file
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MetadataTypeTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MetadataTypeTests.java
index c1aff1bdd..c381dfff3 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MetadataTypeTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MetadataTypeTests.java
@@ -14,12 +14,12 @@ import java.util.List;
  * {@link com.smartdevicelink.proxy.rpc.MetadataTags}
  */
 
-public class MetadataTypeTests extends TestCase{
+public class MetadataTypeTests extends TestCase {
 
 	/**
 	 * Verifies that the enum values are not null upon valid assignment.
 	 */
-	public void testValidEnums () {
+	public void testValidEnums() {
 		String example = "mediaTitle";
 		MetadataType enumMediaTitle = MetadataType.valueForString(example);
 		example = "mediaArtist";
@@ -63,13 +63,12 @@ public class MetadataTypeTests extends TestCase{
 	/**
 	 * Verifies that an invalid assignment is null.
 	 */
-	public void testInvalidEnum () {
+	public void testInvalidEnum() {
 		String example = "MEDIA_TITLEZ";
 		try {
 			MetadataType temp = MetadataType.valueForString(example);
 			assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+		} catch (IllegalArgumentException exception) {
 			fail("Invalid enum throws IllegalArgumentException.");
 		}
 	}
@@ -77,13 +76,12 @@ public class MetadataTypeTests extends TestCase{
 	/**
 	 * Verifies that a null assignment is invalid.
 	 */
-	public void testNullEnum () {
+	public void testNullEnum() {
 		String example = null;
 		try {
 			MetadataType temp = MetadataType.valueForString(example);
 			assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+		} catch (NullPointerException exception) {
 			fail("Null string throws NullPointerException.");
 		}
 	}
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ModuleTypeTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ModuleTypeTests.java
index 18a47b79d..9af8b4867 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ModuleTypeTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ModuleTypeTests.java
@@ -22,9 +22,12 @@ public class ModuleTypeTests extends TestCase {
 		ModuleType enumClimate = ModuleType.valueForString(example);
 		example = "RADIO";
 		ModuleType enumRadio = ModuleType.valueForString(example);
+		example = "SEAT";
+		ModuleType enumSeat = ModuleType.valueForString(example);
 
 		assertNotNull("CLIMATE returned null", enumClimate);
 		assertNotNull("RADIO returned null", enumRadio);
+		assertNotNull("SEAT returned null", enumSeat);
 	}
 
 	/**
@@ -64,6 +67,7 @@ public class ModuleTypeTests extends TestCase {
 		List<ModuleType> enumTestList = new ArrayList<ModuleType>();
 		enumTestList.add(ModuleType.CLIMATE);
 		enumTestList.add(ModuleType.RADIO);
+		enumTestList.add(ModuleType.SEAT);
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SeatMemoryActionTypeTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SeatMemoryActionTypeTests.java
new file mode 100644
index 000000000..2642e35d3
--- /dev/null
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SeatMemoryActionTypeTests.java
@@ -0,0 +1,73 @@
+package com.smartdevicelink.test.rpc.enums;
+
+import com.smartdevicelink.proxy.rpc.enums.SeatMemoryActionType;
+
+import junit.framework.TestCase;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * This is a unit test class for the SmartDeviceLink library project class :
+ * {@link com.smartdevicelink.rpc.enums.SeatMemoryActionType}
+ */
+public class SeatMemoryActionTypeTests extends TestCase {
+
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
+	public void testValidEnums() {
+		String example = "SAVE";
+		SeatMemoryActionType enumSave = SeatMemoryActionType.valueForString(example);
+		example = "RESTORE";
+		SeatMemoryActionType enumRestore = SeatMemoryActionType.valueForString(example);
+		example = "NONE";
+		SeatMemoryActionType enumNone = SeatMemoryActionType.valueForString(example);
+
+		assertNotNull("SAVE returned null", enumSave);
+		assertNotNull("RESTORE returned null", enumRestore);
+		assertNotNull("NONE returned null", enumNone);
+	}
+
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
+	public void testInvalidEnum() {
+		String example = "sAVE";
+		try {
+			SeatMemoryActionType temp = SeatMemoryActionType.valueForString(example);
+			assertNull("Result of valueForString should be null.", temp);
+		} catch (IllegalArgumentException exception) {
+			fail("Invalid enum throws IllegalArgumentException.");
+		}
+	}
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
+	public void testNullEnum() {
+		String example = null;
+		try {
+			SeatMemoryActionType temp = SeatMemoryActionType.valueForString(example);
+			assertNull("Result of valueForString should be null.", temp);
+		} catch (NullPointerException exception) {
+			fail("Null string throws NullPointerException.");
+		}
+	}
+
+	/**
+	 * Verifies the possible enum values of SeatMemoryActionType.
+	 */
+	public void testListEnum() {
+		List<SeatMemoryActionType> enumValueList = Arrays.asList(SeatMemoryActionType.values());
+
+		List<SeatMemoryActionType> enumTestList = new ArrayList<SeatMemoryActionType>();
+		enumTestList.add(SeatMemoryActionType.SAVE);
+		enumTestList.add(SeatMemoryActionType.RESTORE);
+		enumTestList.add(SeatMemoryActionType.NONE);
+
+		assertTrue("Enum value list does not match enum class list",
+				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
+	}
+}
\ No newline at end of file
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SupportedSeatTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SupportedSeatTests.java
new file mode 100644
index 000000000..6a2dbd18f
--- /dev/null
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SupportedSeatTests.java
@@ -0,0 +1,69 @@
+package com.smartdevicelink.test.rpc.enums;
+
+import com.smartdevicelink.proxy.rpc.enums.SupportedSeat;
+
+import junit.framework.TestCase;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * This is a unit test class for the SmartDeviceLink library project class :
+ * {@link com.smartdevicelink.rpc.enums.SupportedSeat}
+ */
+public class SupportedSeatTests extends TestCase {
+
+	/**
+	 * Verifies that the enum values are not null upon valid assignment.
+	 */
+	public void testValidEnums() {
+		String example = "DRIVER";
+		SupportedSeat enumDriver = SupportedSeat.valueForString(example);
+		example = "FRONT_PASSENGER";
+		SupportedSeat enumFrontPassenger = SupportedSeat.valueForString(example);
+
+		assertNotNull("DRIVER returned null", enumDriver);
+		assertNotNull("FRONT_PASSENGER returned null", enumFrontPassenger);
+	}
+
+	/**
+	 * Verifies that an invalid assignment is null.
+	 */
+	public void testInvalidEnum() {
+		String example = "dRIVER";
+		try {
+			SupportedSeat temp = SupportedSeat.valueForString(example);
+			assertNull("Result of valueForString should be null.", temp);
+		} catch (IllegalArgumentException exception) {
+			fail("Invalid enum throws IllegalArgumentException.");
+		}
+	}
+
+	/**
+	 * Verifies that a null assignment is invalid.
+	 */
+	public void testNullEnum() {
+		String example = null;
+		try {
+			SupportedSeat temp = SupportedSeat.valueForString(example);
+			assertNull("Result of valueForString should be null.", temp);
+		} catch (NullPointerException exception) {
+			fail("Null string throws NullPointerException.");
+		}
+	}
+
+	/**
+	 * Verifies the possible enum values of SupportedSeat.
+	 */
+	public void testListEnum() {
+		List<SupportedSeat> enumValueList = Arrays.asList(SupportedSeat.values());
+
+		List<SupportedSeat> enumTestList = new ArrayList<SupportedSeat>();
+		enumTestList.add(SupportedSeat.DRIVER);
+		enumTestList.add(SupportedSeat.FRONT_PASSENGER);
+
+		assertTrue("Enum value list does not match enum class list",
+				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
+	}
+}
\ No newline at end of file
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataTypeTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataTypeTests.java
index 5aa1d7a7e..9f9ff3449 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataTypeTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataTypeTests.java
@@ -76,6 +76,8 @@ public class VehicleDataTypeTests extends TestCase {
 		VehicleDataType enumVehicleDataFuelRange = VehicleDataType.valueForString(example);
 		example = "VEHICLEDATA_TURNSIGNAL";
 		VehicleDataType enumVehicleDataTurnSignal = VehicleDataType.valueForString(example);
+		example = "VEHICLEDATA_ELECTRONICPARKBRAKESTATUS";
+		VehicleDataType enumVehicleDataElectronicParkBrakeStatus = VehicleDataType.valueForString(example);
 		
 		assertNotNull("VEHICLEDATA_GPS returned null", enumVehicleDataGps);
 		assertNotNull("VEHICLEDATA_SPEED returned null", enumVehicleDataSpeed);
@@ -106,6 +108,7 @@ public class VehicleDataTypeTests extends TestCase {
 		assertNotNull("VEHICLEDATA_MYKEY returned null", enumVehicleDataMyKey);
 		assertNotNull("VEHICLEDATA_FUELRANGE returned null", enumVehicleDataFuelRange);
 		assertNotNull("VEHICLEDATA_TURNSIGNAL returned null", enumVehicleDataTurnSignal);
+		assertNotNull("VEHICLEDATA_ELECTRONICPARKBRAKESTATUS returned null", enumVehicleDataElectronicParkBrakeStatus);
 	}
 	
 	/**
@@ -172,6 +175,7 @@ public class VehicleDataTypeTests extends TestCase {
 		enumTestList.add(VehicleDataType.VEHICLEDATA_MYKEY);
 		enumTestList.add(VehicleDataType.VEHICLEDATA_FUELRANGE);
 		enumTestList.add(VehicleDataType.VEHICLEDATA_TURNSIGNAL);
+		enumTestList.add(VehicleDataType.VEHICLEDATA_ELECTRONICPARKBRAKESTATUS);
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnRCStatusTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnRCStatusTests.java
new file mode 100644
index 000000000..5fbd48b91
--- /dev/null
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnRCStatusTests.java
@@ -0,0 +1,93 @@
+package com.smartdevicelink.test.rpc.notifications;
+
+import com.smartdevicelink.marshal.JsonRPCMarshaller;
+import com.smartdevicelink.protocol.enums.FunctionID;
+import com.smartdevicelink.proxy.RPCMessage;
+import com.smartdevicelink.proxy.rpc.ModuleData;
+import com.smartdevicelink.proxy.rpc.OnRCStatus;
+import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.Test;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class OnRCStatusTests extends BaseRpcTests {
+	@Override
+	protected RPCMessage createMessage() {
+		OnRCStatus msg = new OnRCStatus();
+
+		List<ModuleData> listAllocatedModules = new ArrayList<>();
+		listAllocatedModules.add(Test.GENERAL_MODULEDATA);
+
+		msg.setAllocatedModules(listAllocatedModules);
+
+		List<ModuleData> listFreeModules = new ArrayList<>();
+		listFreeModules.add(Test.GENERAL_MODULEDATA);
+		msg.setFreeModules(listFreeModules);
+
+		msg.setAllowed(Test.GENERAL_BOOLEAN);
+		return msg;
+	}
+
+	@Override
+	protected String getMessageType() {
+		return RPCMessage.KEY_NOTIFICATION;
+	}
+
+	@Override
+	protected String getCommandType() {
+		return FunctionID.ON_RC_STATUS.toString();
+	}
+
+	@Override
+	protected JSONObject getExpectedParameters(int sdlVersion) {
+		JSONObject result = new JSONObject();
+
+		JSONArray jsonArrayAllocatedModules = new JSONArray();
+		JSONArray jsonArrayFreeModules = new JSONArray();
+		try {
+			jsonArrayAllocatedModules.put(JsonRPCMarshaller.serializeHashtable(Test.GENERAL_MODULEDATA.getStore()));
+			jsonArrayFreeModules.put(JsonRPCMarshaller.serializeHashtable(Test.GENERAL_MODULEDATA.getStore()));
+		} catch (JSONException e) {
+			e.printStackTrace();
+		}
+
+		try {
+			result.put(OnRCStatus.KEY_ALLOCATED_MODULES, jsonArrayAllocatedModules);
+			result.put(OnRCStatus.KEY_FREE_MODULES, jsonArrayFreeModules);
+			result.put(OnRCStatus.KEY_ALLOWED, Test.GENERAL_BOOLEAN);
+		} catch (JSONException e) {
+			e.printStackTrace();
+		}
+
+		return result;
+	}
+
+	/**
+	 * Tests the expected values of the RPC message.
+	 */
+	public void testRpcValues() {
+		// Test Values
+		List<ModuleData> listAllocatedModules = ((OnRCStatus) msg).getAllocatedModules();
+		List<ModuleData> listFreeModules = ((OnRCStatus) msg).getFreeModules();
+		Boolean allowed = ((OnRCStatus) msg).getAllowed();
+
+		// Valid Tests
+		assertEquals(Test.MATCH, Test.GENERAL_MODULEDATA, listAllocatedModules.get(0));
+		assertEquals(Test.MATCH, Test.GENERAL_MODULEDATA, listFreeModules.get(0));
+		assertEquals(Test.MATCH, (Boolean) Test.GENERAL_BOOLEAN, allowed);
+
+		// Invalid/Null Tests
+		OnRCStatus msg = new OnRCStatus();
+		assertNotNull(Test.NOT_NULL, msg);
+		testNullBase(msg);
+
+		assertNull(Test.NULL, msg.getAllocatedModules());
+		assertNull(Test.NULL, msg.getFreeModules());
+		assertNull(Test.NULL, msg.getAllowed());
+	}
+}
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnVehicleDataTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnVehicleDataTests.java
index 18ad755f9..c530c1278 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnVehicleDataTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnVehicleDataTests.java
@@ -26,6 +26,7 @@ import com.smartdevicelink.proxy.rpc.OnVehicleData;
 import com.smartdevicelink.proxy.rpc.SingleTireStatus;
 import com.smartdevicelink.proxy.rpc.TireStatus;
 import com.smartdevicelink.proxy.rpc.enums.ComponentVolumeStatus;
+import com.smartdevicelink.proxy.rpc.enums.ElectronicParkBrakeStatus;
 import com.smartdevicelink.proxy.rpc.enums.PRNDL;
 import com.smartdevicelink.proxy.rpc.enums.TurnSignal;
 import com.smartdevicelink.proxy.rpc.enums.VehicleDataEventStatus;
@@ -90,6 +91,7 @@ public class OnVehicleDataTests extends BaseRpcTests{
             result.put(OnVehicleData.KEY_MY_KEY, VehicleDataHelper.MY_KEY.serializeJSON());
             result.put(OnVehicleData.KEY_FUEL_RANGE, VehicleDataHelper.JSON_FUEL_RANGE);
 			result.put(OnVehicleData.KEY_TURN_SIGNAL, VehicleDataHelper.TURN_SIGNAL);
+			result.put(OnVehicleData.KEY_ELECTRONIC_PARK_BRAKE_STATUS, VehicleDataHelper.ELECTRONIC_PARK_BRAKE_STATUS);
         } catch(JSONException e) {
         	fail(Test.JSON_FAIL);
         }
@@ -130,6 +132,7 @@ public class OnVehicleDataTests extends BaseRpcTests{
     	MyKey key = ( (OnVehicleData) msg).getMyKey();
     	List<FuelRange> fuelRangeList = ( (OnVehicleData) msg).getFuelRange();
     	TurnSignal turnSignal = ( (OnVehicleData) msg).getTurnSignal();
+    	ElectronicParkBrakeStatus electronicParkBrakeStatus = ( (OnVehicleData) msg).getElectronicParkBrakeStatus();
     	
     	// Valid Tests
     	assertEquals(Test.MATCH, VehicleDataHelper.SPEED, speed);
@@ -160,6 +163,7 @@ public class OnVehicleDataTests extends BaseRpcTests{
 	    assertTrue(Test.TRUE, Validator.validateMyKey(VehicleDataHelper.MY_KEY, key));
 	    assertTrue(Test.TRUE, Validator.validateFuelRange(VehicleDataHelper.FUEL_RANGE_LIST, fuelRangeList));
 	    assertEquals(Test.MATCH, VehicleDataHelper.TURN_SIGNAL, turnSignal);
+	    assertEquals(Test.MATCH, VehicleDataHelper.ELECTRONIC_PARK_BRAKE_STATUS, electronicParkBrakeStatus);
     
 	    // Invalid/Null Tests
         OnVehicleData msg = new OnVehicleData();
@@ -194,6 +198,7 @@ public class OnVehicleDataTests extends BaseRpcTests{
         assertNull(Test.NULL, msg.getMyKey());
         assertNull(Test.NULL, msg.getFuelRange());
         assertNull(Test.NULL, msg.getTurnSignal());
+        assertNull(Test.NULL, msg.getElectronicParkBrakeStatus());
 	}
     
     public void testJson() {
@@ -366,6 +371,7 @@ public class OnVehicleDataTests extends BaseRpcTests{
 			reference.put(OnVehicleData.KEY_MY_KEY, myKeyObj);
 			reference.put(OnVehicleData.KEY_FUEL_RANGE, fuelRangeArrayObj);
 			reference.put(OnVehicleData.KEY_TURN_SIGNAL, VehicleDataHelper.TURN_SIGNAL);
+			reference.put(OnVehicleData.KEY_ELECTRONIC_PARK_BRAKE_STATUS, VehicleDataHelper.ELECTRONIC_PARK_BRAKE_STATUS);
 			
 			JSONObject underTest = msg.serializeJSON();
 			//go inside underTest and only return the JSONObject inside the parameters key inside the notification key
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetVehicleDataTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetVehicleDataTests.java
index fcbdb3a9e..54f299fdf 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetVehicleDataTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetVehicleDataTests.java
@@ -52,6 +52,7 @@ public class GetVehicleDataTests extends BaseRpcTests {
 		msg.setMyKey(Test.GENERAL_BOOLEAN);
 		msg.setFuelRange(Test.GENERAL_BOOLEAN);
 		msg.setTurnSignal(Test.GENERAL_BOOLEAN);
+		msg.setElectronicParkBrakeStatus(Test.GENERAL_BOOLEAN);
 
         return msg;
     }
@@ -99,6 +100,7 @@ public class GetVehicleDataTests extends BaseRpcTests {
             result.put(GetVehicleData.KEY_MY_KEY, Test.GENERAL_BOOLEAN);
             result.put(GetVehicleData.KEY_FUEL_RANGE, Test.GENERAL_BOOLEAN);
             result.put(GetVehicleData.KEY_TURN_SIGNAL, Test.GENERAL_BOOLEAN);
+            result.put(GetVehicleData.KEY_ELECTRONIC_PARK_BRAKE_STATUS, Test.GENERAL_BOOLEAN);
         }catch(JSONException e){
         	fail(Test.JSON_FAIL);
         }
@@ -140,6 +142,7 @@ public class GetVehicleDataTests extends BaseRpcTests {
 		assertTrue(Test.TRUE, ( (GetVehicleData) msg ).getMyKey());
 		assertTrue(Test.TRUE, ( (GetVehicleData) msg ).getFuelRange());
 		assertTrue(Test.TRUE, ( (GetVehicleData) msg ).getTurnSignal());
+		assertTrue(Test.TRUE, ( (GetVehicleData) msg ).getElectronicParkBrakeStatus());
     
 		// Invalid/Null Tests
         GetVehicleData msg = new GetVehicleData();
@@ -174,6 +177,7 @@ public class GetVehicleDataTests extends BaseRpcTests {
         assertNull(Test.NULL, msg.getMyKey());
         assertNull(Test.NULL, msg.getFuelRange());
         assertNull(Test.NULL, msg.getTurnSignal());
+        assertNull(Test.NULL, msg.getElectronicParkBrakeStatus());
     }
     
     /**
@@ -223,6 +227,7 @@ public class GetVehicleDataTests extends BaseRpcTests {
 			assertEquals(Test.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_MY_KEY), cmd.getMyKey());
 			assertEquals(Test.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_FUEL_RANGE), cmd.getFuelRange());
 			assertEquals(Test.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_TURN_SIGNAL), cmd.getTurnSignal());
+			assertEquals(Test.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_ELECTRONIC_PARK_BRAKE_STATUS), cmd.getElectronicParkBrakeStatus());
 		} catch (JSONException e) {
 			fail(Test.JSON_FAIL);
 		}    	
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetMediaClockTimerTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetMediaClockTimerTests.java
index 7d52bb75c..a90bd31b9 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetMediaClockTimerTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetMediaClockTimerTests.java
@@ -10,6 +10,7 @@ import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.rpc.SetMediaClockTimer;
 import com.smartdevicelink.proxy.rpc.StartTime;
+import com.smartdevicelink.proxy.rpc.enums.AudioStreamingIndicator;
 import com.smartdevicelink.proxy.rpc.enums.UpdateMode;
 import com.smartdevicelink.test.BaseRpcTests;
 import com.smartdevicelink.test.JsonUtils;
@@ -19,7 +20,7 @@ import com.smartdevicelink.test.json.rpc.JsonFileReader;
 
 /**
  * This is a unit test class for the SmartDeviceLink library project class : 
- * {@link com.smartdevicelink.rpc.SetMediaClockTimer}
+ * {@link com.smartdevicelink.proxy.rpc.SetMediaClockTimer}
  */
 public class SetMediaClockTimerTests extends BaseRpcTests {
 
@@ -30,6 +31,7 @@ public class SetMediaClockTimerTests extends BaseRpcTests {
 		msg.setStartTime(Test.GENERAL_STARTTIME);
 		msg.setEndTime(Test.GENERAL_STARTTIME);
 		msg.setUpdateMode(Test.GENERAL_UPDATEMODE);
+		msg.setAudioStreamingIndicator(Test.GENERAL_AUDIO_STREAMING_INDICATOR);
 
 		return msg;
 	}
@@ -51,7 +53,8 @@ public class SetMediaClockTimerTests extends BaseRpcTests {
 		try {
 			result.put(SetMediaClockTimer.KEY_START_TIME, Test.JSON_STARTTIME);
 			result.put(SetMediaClockTimer.KEY_END_TIME, Test.JSON_STARTTIME);
-			result.put(SetMediaClockTimer.KEY_UPDATE_MODE, Test.GENERAL_UPDATEMODE);			
+			result.put(SetMediaClockTimer.KEY_UPDATE_MODE, Test.GENERAL_UPDATEMODE);
+			result.put(SetMediaClockTimer.KEY_AUDIO_STREAMING_INDICATOR, Test.GENERAL_AUDIO_STREAMING_INDICATOR);
 		} catch (JSONException e) {
 			fail(Test.JSON_FAIL);
 		}
@@ -67,9 +70,11 @@ public class SetMediaClockTimerTests extends BaseRpcTests {
 		StartTime  testStartTime  = ( (SetMediaClockTimer) msg ).getStartTime();
 		StartTime  testEndTime    = ( (SetMediaClockTimer) msg ).getEndTime();
 		UpdateMode testUpdateMode = ( (SetMediaClockTimer) msg ).getUpdateMode();
+		AudioStreamingIndicator testAudioStreamingIndicator = ( (SetMediaClockTimer) msg ).getAudioStreamingIndicator();
 		
 		// Valid Tests
 		assertEquals(Test.MATCH, Test.GENERAL_UPDATEMODE, testUpdateMode);
+		assertEquals(Test.MATCH, Test.GENERAL_AUDIO_STREAMING_INDICATOR, testAudioStreamingIndicator);
 		assertTrue(Test.TRUE, Validator.validateStartTime(Test.GENERAL_STARTTIME, testStartTime));
 		assertTrue(Test.TRUE, Validator.validateStartTime(Test.GENERAL_STARTTIME, testEndTime));
 		
@@ -81,6 +86,7 @@ public class SetMediaClockTimerTests extends BaseRpcTests {
 		assertNull(Test.NULL, msg.getStartTime());
 		assertNull(Test.NULL, msg.getEndTime());
 		assertNull(Test.NULL, msg.getUpdateMode());
+		assertNull(Test.NULL, msg.getAudioStreamingIndicator());
 	}
 	
 	/**
@@ -110,6 +116,7 @@ public class SetMediaClockTimerTests extends BaseRpcTests {
 			StartTime referenceEndTime = new StartTime(JsonRPCMarshaller.deserializeJSONObject(endTime));
 			assertTrue(Test.TRUE, Validator.validateStartTime(referenceEndTime, cmd.getEndTime()));
 			assertEquals(Test.MATCH, JsonUtils.readStringFromJsonObject(parameters, SetMediaClockTimer.KEY_UPDATE_MODE), cmd.getUpdateMode().toString());
+			assertEquals(Test.MATCH, JsonUtils.readStringFromJsonObject(parameters, SetMediaClockTimer.KEY_AUDIO_STREAMING_INDICATOR), cmd.getAudioStreamingIndicator().toString());
 		} catch (JSONException e) {
 			fail(Test.JSON_FAIL);
 		}    	
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeVehicleDataTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeVehicleDataTests.java
index 0fc662d7f..ce93c52ea 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeVehicleDataTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeVehicleDataTests.java
@@ -51,6 +51,7 @@ public class SubscribeVehicleDataTests extends BaseRpcTests {
 		msg.setMyKey(Test.GENERAL_BOOLEAN);
 		msg.setFuelRange(Test.GENERAL_BOOLEAN);
 		msg.setTurnSignal(Test.GENERAL_BOOLEAN);
+		msg.setElectronicParkBrakeStatus(Test.GENERAL_BOOLEAN);
 		
 		return msg;
 	}
@@ -97,6 +98,7 @@ public class SubscribeVehicleDataTests extends BaseRpcTests {
             result.put(SubscribeVehicleData.KEY_MY_KEY, Test.GENERAL_BOOLEAN);
             result.put(SubscribeVehicleData.KEY_FUEL_RANGE, Test.GENERAL_BOOLEAN);
             result.put(SubscribeVehicleData.KEY_TURN_SIGNAL, Test.GENERAL_BOOLEAN);
+            result.put(SubscribeVehicleData.KEY_ELECTRONIC_PARK_BRAKE_STATUS, Test.GENERAL_BOOLEAN);
 		} catch (JSONException e) {
 			fail(Test.JSON_FAIL);
 		}
@@ -137,6 +139,7 @@ public class SubscribeVehicleDataTests extends BaseRpcTests {
 		assertTrue(Test.MATCH,( (SubscribeVehicleData) msg ).getMyKey());
 		assertTrue(Test.MATCH,( (SubscribeVehicleData) msg ).getFuelRange());
 		assertTrue(Test.MATCH,( (SubscribeVehicleData) msg ).getTurnSignal());
+		assertTrue(Test.MATCH,( (SubscribeVehicleData) msg ).getElectronicParkBrakeStatus());
     
 		// Invalid/Null Tests
 		SubscribeVehicleData msg = new SubscribeVehicleData();
@@ -170,6 +173,7 @@ public class SubscribeVehicleDataTests extends BaseRpcTests {
         assertNull(Test.NULL, msg.getMyKey());
         assertNull(Test.NULL, msg.getFuelRange());
         assertNull(Test.NULL, msg.getTurnSignal());
+        assertNull(Test.NULL, msg.getElectronicParkBrakeStatus());
 	}
 	
     /**
@@ -218,6 +222,7 @@ public class SubscribeVehicleDataTests extends BaseRpcTests {
 			assertEquals(Test.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_MY_KEY), cmd.getMyKey());
 			assertEquals(Test.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_FUEL_RANGE), cmd.getFuelRange());
 			assertEquals(Test.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_TURN_SIGNAL), cmd.getTurnSignal());
+			assertEquals(Test.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_ELECTRONIC_PARK_BRAKE_STATUS), cmd.getElectronicParkBrakeStatus());
 		} catch (JSONException e) {
 			fail(Test.JSON_FAIL);
 		}    	
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeVehicleDataTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeVehicleDataTests.java
index ca2fddc85..af8560410 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeVehicleDataTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeVehicleDataTests.java
@@ -52,6 +52,7 @@ public class UnsubscribeVehicleDataTests extends BaseRpcTests {
 		msg.setMyKey(Test.GENERAL_BOOLEAN);
 		msg.setFuelRange(Test.GENERAL_BOOLEAN);
 		msg.setTurnSignal(Test.GENERAL_BOOLEAN);
+		msg.setElectronicParkBrakeStatus(Test.GENERAL_BOOLEAN);
 
 		return msg;
 	}
@@ -98,6 +99,7 @@ public class UnsubscribeVehicleDataTests extends BaseRpcTests {
             result.put(UnsubscribeVehicleData.KEY_MY_KEY, Test.GENERAL_BOOLEAN);
             result.put(UnsubscribeVehicleData.KEY_FUEL_RANGE, Test.GENERAL_BOOLEAN);
             result.put(UnsubscribeVehicleData.KEY_TURN_SIGNAL, Test.GENERAL_BOOLEAN);
+            result.put(UnsubscribeVehicleData.KEY_ELECTRONIC_PARK_BRAKE_STATUS, Test.GENERAL_BOOLEAN);
 		} catch (JSONException e) {
 			fail(Test.JSON_FAIL);
 		}
@@ -137,6 +139,7 @@ public class UnsubscribeVehicleDataTests extends BaseRpcTests {
 		assertTrue(Test.TRUE,( (UnsubscribeVehicleData) msg ).getMyKey());
 		assertTrue(Test.TRUE,( (UnsubscribeVehicleData) msg ).getFuelRange());
 		assertTrue(Test.TRUE,( (UnsubscribeVehicleData) msg ).getTurnSignal());
+		assertTrue(Test.TRUE,( (UnsubscribeVehicleData) msg ).getElectronicParkBrakeStatus());
 		
 		// Invalid/Null Tests
 		UnsubscribeVehicleData msg = new UnsubscribeVehicleData();
@@ -170,6 +173,7 @@ public class UnsubscribeVehicleDataTests extends BaseRpcTests {
         assertNull(Test.NULL, msg.getMyKey());
         assertNull(Test.NULL, msg.getFuelRange());
         assertNull(Test.NULL, msg.getTurnSignal());
+        assertNull(Test.NULL, msg.getElectronicParkBrakeStatus());
 	}
 
 	/**
@@ -218,6 +222,7 @@ public class UnsubscribeVehicleDataTests extends BaseRpcTests {
 			assertEquals(Test.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_MY_KEY), cmd.getMyKey());
 			assertEquals(Test.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_FUEL_RANGE), cmd.getFuelRange());
 			assertEquals(Test.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_TURN_SIGNAL), cmd.getTurnSignal());
+			assertEquals(Test.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_ELECTRONIC_PARK_BRAKE_STATUS), cmd.getElectronicParkBrakeStatus());
 		} 
 		catch (JSONException e) {
 			fail(Test.JSON_FAIL);
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetVehicleDataResponseTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetVehicleDataResponseTests.java
index 6811ece5f..2bcff82ee 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetVehicleDataResponseTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetVehicleDataResponseTests.java
@@ -89,6 +89,7 @@ public class GetVehicleDataResponseTests extends BaseRpcTests{
             result.put(GetVehicleDataResponse.KEY_MY_KEY, VehicleDataHelper.MY_KEY.serializeJSON());
             result.put(GetVehicleDataResponse.KEY_FUEL_RANGE, VehicleDataHelper.JSON_FUEL_RANGE);
             result.put(GetVehicleDataResponse.KEY_TURN_SIGNAL, VehicleDataHelper.TURN_SIGNAL);
+            result.put(GetVehicleDataResponse.KEY_ELECTRONIC_PARK_BRAKE_STATUS, VehicleDataHelper.ELECTRONIC_PARK_BRAKE_STATUS);
         } catch(JSONException e){
         	fail(Test.JSON_FAIL);
         }
@@ -265,6 +266,7 @@ public class GetVehicleDataResponseTests extends BaseRpcTests{
 			reference.put(GetVehicleDataResponse.KEY_MY_KEY, myKeyObj);
 			reference.put(GetVehicleDataResponse.KEY_FUEL_RANGE, fuelRangeArrayObj);
 			reference.put(GetVehicleDataResponse.KEY_TURN_SIGNAL, TurnSignal.OFF);
+			reference.put(GetVehicleDataResponse.KEY_ELECTRONIC_PARK_BRAKE_STATUS, VehicleDataHelper.ELECTRONIC_PARK_BRAKE_STATUS);
 			
 			JSONObject underTest = msg.serializeJSON();
 			
@@ -446,6 +448,7 @@ public class GetVehicleDataResponseTests extends BaseRpcTests{
 		assertEquals(Test.MATCH, VehicleDataHelper.CLUSTER_MODE_STATUS, ( (GetVehicleDataResponse) msg ).getClusterModeStatus());
 		assertEquals(Test.MATCH, VehicleDataHelper.MY_KEY, ( (GetVehicleDataResponse) msg ).getMyKey());
 		assertEquals(Test.MATCH, VehicleDataHelper.TURN_SIGNAL, ( (GetVehicleDataResponse) msg ).getTurnSignal());
+		assertEquals(Test.MATCH, VehicleDataHelper.ELECTRONIC_PARK_BRAKE_STATUS, ( (GetVehicleDataResponse) msg ).getElectronicParkBrakeStatus());
 		
 		// Invalid/Null Tests
 		GetVehicleDataResponse msg = new GetVehicleDataResponse();
@@ -478,6 +481,7 @@ public class GetVehicleDataResponseTests extends BaseRpcTests{
         assertNull(Test.NULL, msg.getClusterModeStatus());
         assertNull(Test.NULL, msg.getMyKey());
         assertNull(Test.NULL, msg.getTurnSignal());
+        assertNull(Test.NULL, msg.getElectronicParkBrakeStatus());
     }
     
 
@@ -565,6 +569,7 @@ public class GetVehicleDataResponseTests extends BaseRpcTests{
 			assertTrue(Test.TRUE, Validator.validateMyKey(myKey, cmd.getMyKey()) );
 
 			assertEquals(Test.MATCH, JsonUtils.readStringFromJsonObject(parameters, GetVehicleDataResponse.KEY_TURN_SIGNAL), cmd.getTurnSignal().toString());
+			assertEquals(Test.MATCH, JsonUtils.readStringFromJsonObject(parameters, GetVehicleDataResponse.KEY_ELECTRONIC_PARK_BRAKE_STATUS), cmd.getElectronicParkBrakeStatus().toString());
 		} catch (JSONException e) {
 			e.printStackTrace();
 		}    	
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeVehicleDataResponseTest.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeVehicleDataResponseTest.java
index 097b38f44..e1dfc603c 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeVehicleDataResponseTest.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeVehicleDataResponseTest.java
@@ -56,6 +56,7 @@ public class SubscribeVehicleDataResponseTest extends BaseRpcTests {
 		msg.setMyKey(Test.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_MYKEY.ordinal()));
 		msg.setFuelRange(Test.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELRANGE.ordinal()));
 		msg.setTurnSignal(Test.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_TURNSIGNAL.ordinal()));
+		msg.setElectronicParkBrakeStatus(Test.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ELECTRONICPARKBRAKESTATUS.ordinal()));
 
 		return msg;
 	}
@@ -107,6 +108,7 @@ public class SubscribeVehicleDataResponseTest extends BaseRpcTests {
 	        result.put(SubscribeVehicleDataResponse.KEY_MY_KEY, Test.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_MYKEY.ordinal()).serializeJSON());
 	        result.put(SubscribeVehicleDataResponse.KEY_FUEL_RANGE, Test.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELRANGE.ordinal()).serializeJSON());
 	        result.put(SubscribeVehicleDataResponse.KEY_TURN_SIGNAL, Test.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_TURNSIGNAL.ordinal()).serializeJSON());
+	        result.put(SubscribeVehicleDataResponse.KEY_ELECTRONIC_PARK_BRAKE_STATUS, Test.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ELECTRONICPARKBRAKESTATUS.ordinal()).serializeJSON());
 		} catch (JSONException e) {
 			fail(Test.JSON_FAIL);
 		}
@@ -146,6 +148,7 @@ public class SubscribeVehicleDataResponseTest extends BaseRpcTests {
 		VehicleDataResult testWiperStatus    = ( (SubscribeVehicleDataResponse) msg ).getWiperStatus();
 		VehicleDataResult testFuelRange      = ( (SubscribeVehicleDataResponse) msg ).getFuelRange();
 		VehicleDataResult testTurnSignal     = ( (SubscribeVehicleDataResponse) msg ).getTurnSignal();
+		VehicleDataResult testEBrakeStatus   = ( (SubscribeVehicleDataResponse) msg ).getElectronicParkBrakeStatus();
 		
 		// Valid Tests
 		assertTrue(Test.TRUE, testGps.getDataType().equals(VehicleDataType.VEHICLEDATA_GPS));
@@ -175,6 +178,7 @@ public class SubscribeVehicleDataResponseTest extends BaseRpcTests {
 	    assertTrue(Test.TRUE, testWiperStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_WIPERSTATUS));
 	    assertTrue(Test.TRUE, testFuelRange.getDataType().equals(VehicleDataType.VEHICLEDATA_FUELRANGE));
 	    assertTrue(Test.TRUE, testTurnSignal.getDataType().equals(VehicleDataType.VEHICLEDATA_TURNSIGNAL));
+	    assertTrue(Test.TRUE, testEBrakeStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_ELECTRONICPARKBRAKESTATUS));
    
         // Invalid/Null Tests
 		SubscribeVehicleDataResponse msg = new SubscribeVehicleDataResponse();
@@ -208,6 +212,7 @@ public class SubscribeVehicleDataResponseTest extends BaseRpcTests {
         assertNull(Test.NULL, msg.getMyKey());
         assertNull(Test.NULL, msg.getFuelRange());
         assertNull(Test.NULL, msg.getTurnSignal());
+        assertNull(Test.NULL, msg.getElectronicParkBrakeStatus());
     }
 	
     /**
@@ -337,6 +342,10 @@ public class SubscribeVehicleDataResponseTest extends BaseRpcTests {
 			JSONObject turnSignal = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_TURN_SIGNAL);
 			VehicleDataResult referenceTurnSignal = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(turnSignal));
 			assertTrue(Test.TRUE, Validator.validateVehicleDataResult(referenceTurnSignal, cmd.getTurnSignal()));
+
+			JSONObject electronicParkBrakeStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_ELECTRONIC_PARK_BRAKE_STATUS);
+			VehicleDataResult referenceEBrakeStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(electronicParkBrakeStatus));
+			assertTrue(Test.TRUE, Validator.validateVehicleDataResult(referenceEBrakeStatus, cmd.getElectronicParkBrakeStatus()));
 		} catch (JSONException e) {
 			e.printStackTrace();
 		}    	
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeVehicleDataResponseTest.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeVehicleDataResponseTest.java
index 3ca7efdc5..cba7fcf0d 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeVehicleDataResponseTest.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeVehicleDataResponseTest.java
@@ -58,6 +58,7 @@ public class UnsubscribeVehicleDataResponseTest extends BaseRpcTests {
 		msg.setMyKey(Test.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_MYKEY.ordinal()));
 		msg.setFuelRange(Test.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELRANGE.ordinal()));
 		msg.setTurnSignal(Test.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_TURNSIGNAL.ordinal()));
+		msg.setElectronicParkBrakeStatus(Test.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ELECTRONICPARKBRAKESTATUS.ordinal()));
 
 		return msg;
 	}
@@ -109,6 +110,7 @@ public class UnsubscribeVehicleDataResponseTest extends BaseRpcTests {
 	        result.put(SubscribeVehicleDataResponse.KEY_MY_KEY, Test.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_MYKEY.ordinal()).serializeJSON());
 	        result.put(SubscribeVehicleDataResponse.KEY_FUEL_RANGE, Test.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELRANGE.ordinal()).serializeJSON());
 	        result.put(SubscribeVehicleDataResponse.KEY_TURN_SIGNAL, Test.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_TURNSIGNAL.ordinal()).serializeJSON());
+	        result.put(SubscribeVehicleDataResponse.KEY_ELECTRONIC_PARK_BRAKE_STATUS, Test.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ELECTRONICPARKBRAKESTATUS.ordinal()).serializeJSON());
 		} catch (JSONException e) {
 			fail(Test.JSON_FAIL);
 		}
@@ -148,6 +150,7 @@ public class UnsubscribeVehicleDataResponseTest extends BaseRpcTests {
 		VehicleDataResult testWiperStatus    = ( (UnsubscribeVehicleDataResponse) msg ).getWiperStatus();
 		VehicleDataResult testFuelRange      = ( (UnsubscribeVehicleDataResponse) msg ).getFuelRange();
 		VehicleDataResult testTurnSignal     = ( (UnsubscribeVehicleDataResponse) msg ).getTurnSignal();
+		VehicleDataResult testEBrakeStatus   = ( (UnsubscribeVehicleDataResponse) msg ).getElectronicParkBrakeStatus();
 		
 		// Valid Tests
 		assertTrue(Test.TRUE, testGps.getDataType().equals(VehicleDataType.VEHICLEDATA_GPS));
@@ -177,6 +180,7 @@ public class UnsubscribeVehicleDataResponseTest extends BaseRpcTests {
 	    assertTrue(Test.TRUE, testWiperStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_WIPERSTATUS));
 	    assertTrue(Test.TRUE, testFuelRange.getDataType().equals(VehicleDataType.VEHICLEDATA_FUELRANGE));
 	    assertTrue(Test.TRUE, testTurnSignal.getDataType().equals(VehicleDataType.VEHICLEDATA_TURNSIGNAL));
+	    assertTrue(Test.TRUE, testEBrakeStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_ELECTRONICPARKBRAKESTATUS));
    
         // Invalid/Null Tests
 		UnsubscribeVehicleDataResponse msg = new UnsubscribeVehicleDataResponse();
@@ -210,6 +214,7 @@ public class UnsubscribeVehicleDataResponseTest extends BaseRpcTests {
         assertNull(Test.NULL, msg.getMyKey());
         assertNull(Test.NULL, msg.getFuelRange());
         assertNull(Test.NULL, msg.getTurnSignal());
+        assertNull(Test.NULL, msg.getElectronicParkBrakeStatus());
     }
 
     /**
@@ -339,6 +344,10 @@ public class UnsubscribeVehicleDataResponseTest extends BaseRpcTests {
 			JSONObject turnSignal = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_TURN_SIGNAL);
 			VehicleDataResult referenceTurnSignal = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(turnSignal));
 			assertTrue(Test.TRUE, Validator.validateVehicleDataResult(referenceTurnSignal, cmd.getTurnSignal()));
+
+			JSONObject eBrakeStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_ELECTRONIC_PARK_BRAKE_STATUS);
+			VehicleDataResult referenceEBrakeStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(eBrakeStatus));
+			assertTrue(Test.TRUE, Validator.validateVehicleDataResult(referenceEBrakeStatus, cmd.getElectronicParkBrakeStatus()));
 		} catch (JSONException e) {
 			e.printStackTrace();
 		}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/api/ProxyBridge.java b/sdl_android/src/main/java/com/smartdevicelink/api/ProxyBridge.java
index e5f049126..eca5fe3a8 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/api/ProxyBridge.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/api/ProxyBridge.java
@@ -41,6 +41,7 @@ import com.smartdevicelink.proxy.rpc.OnKeyboardInput;
 import com.smartdevicelink.proxy.rpc.OnLanguageChange;
 import com.smartdevicelink.proxy.rpc.OnLockScreenStatus;
 import com.smartdevicelink.proxy.rpc.OnPermissionsChange;
+import com.smartdevicelink.proxy.rpc.OnRCStatus;
 import com.smartdevicelink.proxy.rpc.OnStreamRPC;
 import com.smartdevicelink.proxy.rpc.OnSystemRequest;
 import com.smartdevicelink.proxy.rpc.OnTBTClientState;
@@ -76,32 +77,34 @@ import com.smartdevicelink.proxy.rpc.UnsubscribeVehicleDataResponse;
 import com.smartdevicelink.proxy.rpc.UnsubscribeWayPointsResponse;
 import com.smartdevicelink.proxy.rpc.UpdateTurnListResponse;
 import com.smartdevicelink.proxy.rpc.enums.SdlDisconnectedReason;
+import com.smartdevicelink.proxy.rpc.listeners.OnRPCListener;
 
 import java.util.concurrent.CopyOnWriteArrayList;
 
 public class ProxyBridge implements IProxyListener{
 	private final Object RPC_LISTENER_LOCK = new Object();
-	protected SparseArray<CopyOnWriteArrayList<OnRPCListener>> rpcListeners = null;
-	final LifecycleListener lifecycleListener;
+	private SparseArray<CopyOnWriteArrayList<OnRPCListener>> rpcListeners = null;
+	private final LifecycleListener lifecycleListener;
 
 	@Override
 	public void onProxyOpened() {}
 
 	@Override
 	public void onRegisterAppInterfaceResponse(RegisterAppInterfaceResponse response) {
+		onRPCReceived(response);
 		if(response.getSuccess()){
 			lifecycleListener.onProxyConnected();
 		}
 	}
 
 	@Override
-	public void onOnAppInterfaceUnregistered(OnAppInterfaceUnregistered notification) {}
+	public void onOnAppInterfaceUnregistered(OnAppInterfaceUnregistered notification) {
+		onRPCReceived(notification);
+	}
 
 	@Override
-	public void onUnregisterAppInterfaceResponse(UnregisterAppInterfaceResponse response) {}
-
-	public interface OnRPCListener {
-		void onRpcReceived(int functionID, RPCMessage message);
+	public void onUnregisterAppInterfaceResponse(UnregisterAppInterfaceResponse response) {
+		onRPCReceived(response);
 	}
 
 	protected interface LifecycleListener{
@@ -123,7 +126,7 @@ public class ProxyBridge implements IProxyListener{
 			CopyOnWriteArrayList<OnRPCListener> listeners = rpcListeners.get(id);
 			if(listeners!=null && listeners.size()>0) {
 				for (OnRPCListener listener : listeners) {
-					listener.onRpcReceived(id,message);
+					listener.onReceived(message);
 				}
 				return true;
 			}
@@ -549,4 +552,9 @@ public class ProxyBridge implements IProxyListener{
 	public void onSendHapticDataResponse(SendHapticDataResponse response) {
 		onRPCReceived(response);
 	}
+
+	@Override
+	public void onOnRCStatus(OnRCStatus notification) {
+		onRPCReceived(notification);
+	}
 }
diff --git a/sdl_android/src/main/java/com/smartdevicelink/api/SdlManager.java b/sdl_android/src/main/java/com/smartdevicelink/api/SdlManager.java
index acb98ba5a..50eb3844a 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/api/SdlManager.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/api/SdlManager.java
@@ -26,7 +26,9 @@ import com.smartdevicelink.proxy.rpc.enums.Language;
 import com.smartdevicelink.proxy.rpc.enums.SdlDisconnectedReason;
 import com.smartdevicelink.proxy.rpc.enums.SystemCapabilityType;
 import com.smartdevicelink.proxy.rpc.listeners.OnMultipleRequestListener;
+import com.smartdevicelink.proxy.rpc.listeners.OnRPCListener;
 import com.smartdevicelink.proxy.rpc.listeners.OnRPCNotificationListener;
+import com.smartdevicelink.proxy.rpc.listeners.OnRPCResponseListener;
 import com.smartdevicelink.streaming.audio.AudioStreamingCodec;
 import com.smartdevicelink.streaming.audio.AudioStreamingParams;
 import com.smartdevicelink.streaming.video.VideoStreamingParameters;
@@ -65,7 +67,7 @@ public class SdlManager{
 	private Vector<TTSChunk> ttsChunks;
 	private TemplateColorScheme dayColorScheme, nightColorScheme;
 
-	private CompletionListener initListener;
+	private SdlManagerListener managerListener;
 	private int state = -1;
 	//public LockScreenConfig lockScreenConfig;
 
@@ -110,7 +112,7 @@ public class SdlManager{
 		}
 	});
 
-    // Sub manager listener
+	// Sub manager listener
 	private final CompletionListener subManagerListener = new CompletionListener() {
 		@Override
 		public synchronized void onComplete(boolean success) {
@@ -128,9 +130,8 @@ public class SdlManager{
 					*/
 					){
 				state = BaseSubManager.READY;
-				if(initListener != null){
-					initListener.onComplete(true);
-					initListener = null;
+				if(managerListener != null){
+					managerListener.onStart();
 				}
 			}
 		}
@@ -171,6 +172,10 @@ public class SdlManager{
 		this.screenManager.dispose();
 		this.audioStreamManager.dispose();
 		*/
+		if(managerListener != null){
+			managerListener.onDestroy();
+			managerListener = null;
+		}
 	}
 
 	/**
@@ -187,15 +192,18 @@ public class SdlManager{
 		SdlManager sdlManager;
 
 		/**
-		 * Main Builder for SDL Manager<br>
-		 *
-		 * The following setters are <strong>REQUIRED:</strong><br>
-		 *
-		 * • setAppId <br>
-		 * • setAppName
+		 * Builder for the SdlManager. Parameters in the constructor are required.
+		 * @param context the current context
+		 * @param appId the app's ID
+		 * @param appName the app's name
+		 * @param listener a SdlManagerListener object
 		 */
-		public Builder(){
+		public Builder(@NonNull Context context, @NonNull final String appId, @NonNull final String appName, @NonNull final SdlManagerListener listener){
 			sdlManager = new SdlManager();
+			setContext(context);
+			setAppId(appId);
+			setAppName(appName);
+			setManagerListener(listener);
 		}
 
 		/**
@@ -311,7 +319,17 @@ public class SdlManager{
 			return this;
 		}
 
+		/**
+		 * Set the SdlManager Listener
+		 * @param listener the listener
+		 */
+		public Builder setManagerListener(@NonNull final SdlManagerListener listener){
+			sdlManager.managerListener = listener;
+			return this;
+		}
+
 		public SdlManager build() {
+
 			if (sdlManager.appName == null) {
 				throw new IllegalArgumentException("You must specify an app name by calling setAppName");
 			}
@@ -320,6 +338,10 @@ public class SdlManager{
 				throw new IllegalArgumentException("You must specify an app ID by calling setAppId");
 			}
 
+			if (sdlManager.managerListener == null) {
+				throw new IllegalArgumentException("You must set a SdlManagerListener object");
+			}
+
 			if (sdlManager.hmiTypes == null) {
 				Vector<AppHMIType> hmiTypesDefault = new Vector<>();
 				hmiTypesDefault.add(AppHMIType.DEFAULT);
@@ -378,11 +400,11 @@ public class SdlManager{
 	}
 	
 
-    /**
-     * Gets the AudioStreamManager. <br>
-     * <strong>Note: AudioStreamManager should be used only after SdlManager.start() CompletionListener callback is completed successfully.</strong>
-     * @return a AudioStreamManager object
-     */
+	/**
+	 * Gets the AudioStreamManager. <br>
+	 * <strong>Note: AudioStreamManager should be used only after SdlManager.start() CompletionListener callback is completed successfully.</strong>
+	 * @return a AudioStreamManager object
+	 */
     /*
 	public AudioStreamManager getAudioStreamManager() {
 		checkSdlManagerState();
@@ -390,11 +412,11 @@ public class SdlManager{
 	}
 	*/
 
-    /**
-     * Gets the ScreenManager. <br>
-     * <strong>Note: ScreenManager should be used only after SdlManager.start() CompletionListener callback is completed successfully.</strong>
-     * @return a ScreenManager object
-     */
+	/**
+	 * Gets the ScreenManager. <br>
+	 * <strong>Note: ScreenManager should be used only after SdlManager.start() CompletionListener callback is completed successfully.</strong>
+	 * @return a ScreenManager object
+	 */
     /*
 	public ScreenManager getScreenManager() {
 		checkSdlManagerState();
@@ -402,11 +424,11 @@ public class SdlManager{
 	}
 	*/
 
-    /**
-     * Gets the LockScreenManager. <br>
-     * <strong>Note: LockScreenManager should be used only after SdlManager.start() CompletionListener callback is completed successfully.</strong>
-     * @return a LockScreenManager object
-     */
+	/**
+	 * Gets the LockScreenManager. <br>
+	 * <strong>Note: LockScreenManager should be used only after SdlManager.start() CompletionListener callback is completed successfully.</strong>
+	 * @return a LockScreenManager object
+	 */
     /*
 	public LockscreenManager getLockscreenManager() {
 		checkSdlManagerState();
@@ -504,18 +526,31 @@ public class SdlManager{
 		}
 	}
 
+	/**
+	 * Add an OnRPCNotificationListener for HMI status notifications
+	 * @param listener listener that will be called when the HMI status changes
+	 */
+	public void addOnHmiStatusListener(OnRPCNotificationListener listener){
+		proxy.addOnRPCNotificationListener(FunctionID.ON_HMI_STATUS,listener);
+	}
+
+	/**
+	 * Remove an OnRPCNotificationListener for HMI status notifications
+	 * @param listener listener that was previously added for the HMI status notifications
+	 */
+	public void removeOnHmiStatusListener(OnRPCNotificationListener listener){
+		proxy.removeOnRPCNotificationListener(FunctionID.ON_HMI_STATUS, listener);
+	}
+
 	// LIFECYCLE / OTHER
 
 	// STARTUP
 
 	/**
 	 * Starts up a SdlManager, and calls provided callback called once all BaseSubManagers are done setting up
-	 * @param listener CompletionListener that is called once the SdlManager state transitions
-	 * from SETTING_UP to READY or ERROR
 	 */
 	@SuppressWarnings("unchecked")
-	public void start(@NonNull CompletionListener listener){
-		initListener = listener;
+	public void start(){
 		if (proxy == null) {
 			try {
 				proxy = new SdlProxyBase(proxyBridge, appName, shortAppName, isMediaApp, hmiLanguage,
@@ -523,7 +558,9 @@ public class SdlManager{
 						nightColorScheme) {
 				};
 			} catch (SdlException e) {
-				listener.onComplete(false);
+				if (managerListener != null) {
+					managerListener.onError("Unable to start manager", e);
+				}
 			}
 		}
 	}
@@ -589,7 +626,7 @@ public class SdlManager{
 
 		@Override
 		public void startAudioService(boolean isEncrypted, AudioStreamingCodec codec,
-									  AudioStreamingParams params) {
+		                              AudioStreamingParams params) {
 			if(proxy.getIsConnected()){
 				proxy.startAudioStream(isEncrypted, codec, params);
 			}
@@ -604,7 +641,7 @@ public class SdlManager{
 
 		@Override
 		public IAudioStreamListener startAudioStream(boolean isEncrypted, AudioStreamingCodec codec,
-													 AudioStreamingParams params) {
+		                                             AudioStreamingParams params) {
 			return proxy.startAudioStream(isEncrypted, codec, params);
 		}
 
@@ -644,6 +681,16 @@ public class SdlManager{
 		}
 
 		@Override
+		public void addOnRPCListener(final FunctionID responseId, final OnRPCListener listener) {
+			proxyBridge.addRpcListener(responseId, listener);
+		}
+
+		@Override
+		public boolean removeOnRPCListener(final FunctionID responseId, final OnRPCListener listener) {
+			return proxyBridge.removeOnRPCListener(responseId, listener);
+		}
+
+		@Override
 		public Object getCapability(SystemCapabilityType systemCapabilityType){
 			return proxy.getCapability(systemCapabilityType);
 		}
@@ -659,6 +706,16 @@ public class SdlManager{
 		}
 
 		@Override
+		public void addOnSystemCapabilityListener(SystemCapabilityType systemCapabilityType, OnSystemCapabilityListener listener) {
+			proxy.addOnSystemCapabilityListener(systemCapabilityType, listener);
+		}
+
+		@Override
+		public boolean removeOnSystemCapabilityListener(SystemCapabilityType systemCapabilityType, OnSystemCapabilityListener listener) {
+			return proxy.removeOnSystemCapabilityListener(systemCapabilityType, listener);
+		}
+
+		@Override
 		public SdlMsgVersion getSdlMsgVersion(){
 			try {
 				return proxy.getSdlMsgVersion();
diff --git a/sdl_android/src/main/java/com/smartdevicelink/api/SdlManagerListener.java b/sdl_android/src/main/java/com/smartdevicelink/api/SdlManagerListener.java
new file mode 100644
index 000000000..7349ab645
--- /dev/null
+++ b/sdl_android/src/main/java/com/smartdevicelink/api/SdlManagerListener.java
@@ -0,0 +1,21 @@
+package com.smartdevicelink.api;
+
+public interface SdlManagerListener {
+
+	/**
+	 * Called when a manager is ready for use
+	 */
+	void onStart();
+
+	/**
+	 * Called when the manager is destroyed
+	 */
+	void onDestroy();
+
+	/**
+	 * Called when the manager encounters an error
+	 * @param info info regarding the error
+	 * @param e the exception
+	 */
+	void onError(String info, Exception e);
+}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/protocol/enums/FunctionID.java b/sdl_android/src/main/java/com/smartdevicelink/protocol/enums/FunctionID.java
index 09e31f8e7..4f1ad71b5 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/protocol/enums/FunctionID.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/protocol/enums/FunctionID.java
@@ -82,6 +82,7 @@ public enum FunctionID{
     ON_HASH_CHANGE(32782, "OnHashChange"),

     ON_INTERIOR_VEHICLE_DATA(32783, "OnInteriorVehicleData"),

     ON_WAY_POINT_CHANGE(32784, "OnWayPointChange"),

+    ON_RC_STATUS(32785, "OnRCStatus"),

 

     // MOCKED FUNCTIONS (NOT SENT FROM HEAD-UNIT)

     ON_LOCK_SCREEN_STATUS(-1, "OnLockScreenStatus"),

diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java
index 0dd54ca65..df516aef5 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java
@@ -1,30 +1,5 @@
 package com.smartdevicelink.proxy;

 

-import java.io.BufferedReader;

-import java.io.DataOutputStream;

-import java.io.FileInputStream;

-import java.io.IOException;

-import java.io.InputStream;

-import java.io.InputStreamReader;

-import java.io.OutputStream;

-import java.io.UnsupportedEncodingException;

-import java.net.HttpURLConnection;

-import java.net.MalformedURLException;

-import java.net.ProtocolException;

-import java.net.URL;

-import java.util.Hashtable;

-import java.util.List;

-import java.util.Vector;

-import java.util.concurrent.Callable;

-import java.util.concurrent.CopyOnWriteArrayList;

-import java.util.concurrent.Executors;

-import java.util.concurrent.FutureTask;

-import java.util.concurrent.ScheduledExecutorService;

-

-import org.json.JSONArray;

-import org.json.JSONException;

-import org.json.JSONObject;

-

 import android.annotation.TargetApi;

 import android.app.Service;

 import android.content.Context;

@@ -50,7 +25,6 @@ import com.smartdevicelink.Dispatcher.ProxyMessageDispatcher;
 import com.smartdevicelink.SdlConnection.ISdlConnectionListener;

 import com.smartdevicelink.SdlConnection.SdlConnection;

 import com.smartdevicelink.SdlConnection.SdlSession;

-import com.smartdevicelink.proxy.rpc.TemplateColorScheme;

 import com.smartdevicelink.encoder.VirtualDisplayEncoder;

 import com.smartdevicelink.exception.SdlException;

 import com.smartdevicelink.exception.SdlExceptionCause;

@@ -100,12 +74,13 @@ import com.smartdevicelink.proxy.rpc.enums.TouchType;
 import com.smartdevicelink.proxy.rpc.enums.UpdateMode;

 import com.smartdevicelink.proxy.rpc.listeners.OnMultipleRequestListener;

 import com.smartdevicelink.proxy.rpc.listeners.OnPutFileUpdateListener;

+import com.smartdevicelink.proxy.rpc.listeners.OnRPCListener;

 import com.smartdevicelink.proxy.rpc.listeners.OnRPCNotificationListener;

 import com.smartdevicelink.proxy.rpc.listeners.OnRPCResponseListener;

 import com.smartdevicelink.security.SdlSecurityBase;

+import com.smartdevicelink.streaming.StreamRPCPacketizer;

 import com.smartdevicelink.streaming.audio.AudioStreamingCodec;

 import com.smartdevicelink.streaming.audio.AudioStreamingParams;

-import com.smartdevicelink.streaming.StreamRPCPacketizer;

 import com.smartdevicelink.streaming.video.SdlRemoteDisplay;

 import com.smartdevicelink.streaming.video.VideoStreamingParameters;

 import com.smartdevicelink.trace.SdlTrace;

@@ -118,6 +93,31 @@ import com.smartdevicelink.util.CorrelationIdGenerator;
 import com.smartdevicelink.util.DebugTool;

 import com.smartdevicelink.util.Version;

 

+import org.json.JSONArray;

+import org.json.JSONException;

+import org.json.JSONObject;

+

+import java.io.BufferedReader;

+import java.io.DataOutputStream;

+import java.io.FileInputStream;

+import java.io.IOException;

+import java.io.InputStream;

+import java.io.InputStreamReader;

+import java.io.OutputStream;

+import java.io.UnsupportedEncodingException;

+import java.net.HttpURLConnection;

+import java.net.MalformedURLException;

+import java.net.ProtocolException;

+import java.net.URL;

+import java.util.Hashtable;

+import java.util.List;

+import java.util.Vector;

+import java.util.concurrent.Callable;

+import java.util.concurrent.CopyOnWriteArrayList;

+import java.util.concurrent.Executors;

+import java.util.concurrent.FutureTask;

+import java.util.concurrent.ScheduledExecutorService;

+

 

 @SuppressWarnings({"WeakerAccess", "Convert2Diamond"})

 public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> {

@@ -335,6 +335,18 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase>
 		}

 

 		@Override

+		public void addOnRPCListener(FunctionID responseId, OnRPCListener listener) {

+			DebugTool.logError("Proxy.addOnRPCResponseListener() is not implemented yet");

+

+		}

+

+		@Override

+		public boolean removeOnRPCListener(FunctionID responseId, OnRPCListener listener) {

+			DebugTool.logError("Proxy.removeOnRPCResponseListener() is not implemented yet");

+			return false;

+		}

+

+		@Override

 		public Object getCapability(SystemCapabilityType systemCapabilityType){

 			return SdlProxyBase.this.getCapability(systemCapabilityType);

 		}

@@ -365,6 +377,16 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase>
 		}

 

 		@Override

+		public void addOnSystemCapabilityListener(SystemCapabilityType systemCapabilityType, OnSystemCapabilityListener listener) {

+			SdlProxyBase.this.removeOnSystemCapabilityListener(systemCapabilityType, listener);

+		}

+

+		@Override

+		public boolean removeOnSystemCapabilityListener(SystemCapabilityType systemCapabilityType, OnSystemCapabilityListener listener) {

+			return SdlProxyBase.this.removeOnSystemCapabilityListener(systemCapabilityType, listener);

+		}

+

+		@Override

 		public void startAudioService(boolean isEncrypted, AudioStreamingCodec codec,

 									  AudioStreamingParams params) {

 			if(getIsConnected()){

@@ -3561,6 +3583,22 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase>
 					onRPCNotificationReceived(msg);

 				}

 			}

+			else if (functionName.equals(FunctionID.ON_RC_STATUS.toString())) {

+				final OnRCStatus msg = new OnRCStatus(hash);

+				if (_callbackToUIThread) {

+					// Run in UI thread

+					_mainUIHandler.post(new Runnable() {

+						@Override

+						public void run() {

+							_proxyListener.onOnRCStatus(msg);

+							onRPCNotificationReceived(msg);

+						}

+					});

+				} else {

+					_proxyListener.onOnRCStatus(msg);

+					onRPCNotificationReceived(msg);

+				}

+			}

 			else {

 				if (_sdlMsgVersion != null) {

 					DebugTool.logInfo("Unrecognized notification Message: " + functionName +

@@ -6929,6 +6967,29 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase>
 		}

 	}

 

+	/**

+	 * Add a listener to be called whenever a new capability is retrieved

+	 * @param systemCapabilityType Type of capability desired

+	 * @param listener callback to execute upon retrieving capability

+	 */

+	public void addOnSystemCapabilityListener(final SystemCapabilityType systemCapabilityType, final OnSystemCapabilityListener listener) {

+		if(_systemCapabilityManager != null){

+			_systemCapabilityManager.addOnSystemCapabilityListener(systemCapabilityType, listener);

+		}

+	}

+

+	/**

+	 * Remove an OnSystemCapabilityListener that was previously added

+	 * @param systemCapabilityType Type of capability

+	 * @param listener the listener that should be removed

+	 */

+	public boolean removeOnSystemCapabilityListener(final SystemCapabilityType systemCapabilityType, final OnSystemCapabilityListener listener){

+		if(_systemCapabilityManager != null){

+			return _systemCapabilityManager.removeOnSystemCapabilityListener(systemCapabilityType, listener);

+		}

+		return false;

+	}

+

 	/* ******************* END Public Helper Methods *************************/

 	

 	/**

diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/SystemCapabilityManager.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/SystemCapabilityManager.java
index 710355c49..0d2ed9864 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/SystemCapabilityManager.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/SystemCapabilityManager.java
@@ -1,6 +1,5 @@
 package com.smartdevicelink.proxy;
 
-import com.smartdevicelink.exception.SdlException;
 import com.smartdevicelink.proxy.interfaces.ISdl;
 import com.smartdevicelink.proxy.interfaces.OnSystemCapabilityListener;
 import com.smartdevicelink.proxy.rpc.GetSystemCapability;
@@ -12,31 +11,36 @@ import com.smartdevicelink.proxy.rpc.enums.SystemCapabilityType;
 import com.smartdevicelink.proxy.rpc.listeners.OnRPCResponseListener;
 import com.smartdevicelink.util.CorrelationIdGenerator;
 
-import java.security.InvalidParameterException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 public class SystemCapabilityManager {
-	HashMap<SystemCapabilityType, Object> cachedSystemCapabilities = new HashMap<>();
-	ISdl callback;
+	private final HashMap<SystemCapabilityType, Object> cachedSystemCapabilities;
+	private final HashMap<SystemCapabilityType, CopyOnWriteArrayList<OnSystemCapabilityListener>> onSystemCapabilityListeners;
+	private final Object LISTENER_LOCK;
+	private final ISdl callback;
 
 	public SystemCapabilityManager(ISdl callback){
 		this.callback = callback;
+		this.LISTENER_LOCK = new Object();
+		this.onSystemCapabilityListeners = new HashMap<>();
+		this.cachedSystemCapabilities = new HashMap<>();
 	}
 
 	public void parseRAIResponse(RegisterAppInterfaceResponse response){
 		if(response!=null && response.getSuccess()) {
-			cachedSystemCapabilities.put(SystemCapabilityType.HMI, response.getHmiCapabilities());
-			cachedSystemCapabilities.put(SystemCapabilityType.DISPLAY, response.getDisplayCapabilities());
-			cachedSystemCapabilities.put(SystemCapabilityType.AUDIO_PASSTHROUGH, response.getAudioPassThruCapabilities());
-			cachedSystemCapabilities.put(SystemCapabilityType.PCM_STREAMING, response.getPcmStreamingCapabilities());
-			cachedSystemCapabilities.put(SystemCapabilityType.BUTTON, response.getButtonCapabilities());
-			cachedSystemCapabilities.put(SystemCapabilityType.HMI_ZONE, response.getHmiZoneCapabilities());
-			cachedSystemCapabilities.put(SystemCapabilityType.PRESET_BANK, response.getPresetBankCapabilities());
-			cachedSystemCapabilities.put(SystemCapabilityType.SOFTBUTTON, response.getSoftButtonCapabilities());
-			cachedSystemCapabilities.put(SystemCapabilityType.SPEECH, response.getSpeechCapabilities());
-			cachedSystemCapabilities.put(SystemCapabilityType.VOICE_RECOGNITION, response.getVrCapabilities());
+			setCapability(SystemCapabilityType.HMI, response.getHmiCapabilities());
+			setCapability(SystemCapabilityType.DISPLAY, response.getDisplayCapabilities());
+			setCapability(SystemCapabilityType.AUDIO_PASSTHROUGH, response.getAudioPassThruCapabilities());
+			setCapability(SystemCapabilityType.PCM_STREAMING, response.getPcmStreamingCapabilities());
+			setCapability(SystemCapabilityType.BUTTON, response.getButtonCapabilities());
+			setCapability(SystemCapabilityType.HMI_ZONE, response.getHmiZoneCapabilities());
+			setCapability(SystemCapabilityType.PRESET_BANK, response.getPresetBankCapabilities());
+			setCapability(SystemCapabilityType.SOFTBUTTON, response.getSoftButtonCapabilities());
+			setCapability(SystemCapabilityType.SPEECH, response.getSpeechCapabilities());
+			setCapability(SystemCapabilityType.VOICE_RECOGNITION, response.getVrCapabilities());
 		}
 	}
 
@@ -46,8 +50,25 @@ public class SystemCapabilityManager {
 	 * @param systemCapabilityType
 	 * @param capability
 	 */
-	public void setCapability(SystemCapabilityType systemCapabilityType, Object capability){
-		cachedSystemCapabilities.put(systemCapabilityType,capability);
+	public synchronized void setCapability(SystemCapabilityType systemCapabilityType, Object capability){
+			cachedSystemCapabilities.put(systemCapabilityType, capability);
+			notifyListeners(systemCapabilityType, capability);
+	}
+
+	/**
+	 * Notify listners in the list about the new retrieved capability
+	 * @param systemCapabilityType
+	 * @param capability
+	 */
+	private void notifyListeners(SystemCapabilityType systemCapabilityType, Object capability) {
+		synchronized(LISTENER_LOCK){
+			CopyOnWriteArrayList<OnSystemCapabilityListener> listeners = onSystemCapabilityListeners.get(systemCapabilityType);
+			if(listeners != null && listeners.size() > 0) {
+				for (OnSystemCapabilityListener listener : listeners) {
+					listener.onCapabilityRetrieved(capability);
+				}
+			}
+		}
 	}
 
 	/**
@@ -109,6 +130,40 @@ public class SystemCapabilityManager {
 	}
 
 	/**
+	 * Add a listener to be called whenever a new capability is retrieved
+	 * @param systemCapabilityType Type of capability desired
+	 * @param listener callback to execute upon retrieving capability
+	 */
+	public void addOnSystemCapabilityListener(final SystemCapabilityType systemCapabilityType, final OnSystemCapabilityListener listener){
+		getCapability(systemCapabilityType, listener);
+		synchronized(LISTENER_LOCK){
+			if (systemCapabilityType != null && listener != null) {
+				if (onSystemCapabilityListeners.get(systemCapabilityType) == null) {
+					onSystemCapabilityListeners.put(systemCapabilityType, new CopyOnWriteArrayList<OnSystemCapabilityListener>());
+				}
+				onSystemCapabilityListeners.get(systemCapabilityType).add(listener);
+			}
+		}
+	}
+
+	/**
+	 * Remove an OnSystemCapabilityListener that was previously added
+	 * @param systemCapabilityType Type of capability
+	 * @param listener the listener that should be removed
+	 */
+	public boolean removeOnSystemCapabilityListener(final SystemCapabilityType systemCapabilityType, final OnSystemCapabilityListener listener){
+		synchronized(LISTENER_LOCK){
+			if(onSystemCapabilityListeners!= null
+					&& systemCapabilityType != null
+					&& listener != null
+					&& onSystemCapabilityListeners.get(systemCapabilityType) != null){
+				return onSystemCapabilityListeners.get(systemCapabilityType).remove(listener);
+			}
+		}
+		return false;
+	}
+
+	/**
 	 * @param systemCapabilityType Type of capability desired
 	 * passes GetSystemCapabilityType request to  `callback` to be sent by proxy
 	 */
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/IProxyListenerBase.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/IProxyListenerBase.java
index 618819f20..b7486785f 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/IProxyListenerBase.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/IProxyListenerBase.java
@@ -35,6 +35,7 @@ import com.smartdevicelink.proxy.rpc.OnKeyboardInput;
 import com.smartdevicelink.proxy.rpc.OnLanguageChange;

 import com.smartdevicelink.proxy.rpc.OnLockScreenStatus;

 import com.smartdevicelink.proxy.rpc.OnPermissionsChange;

+import com.smartdevicelink.proxy.rpc.OnRCStatus;

 import com.smartdevicelink.proxy.rpc.OnStreamRPC;

 import com.smartdevicelink.proxy.rpc.OnSystemRequest;

 import com.smartdevicelink.proxy.rpc.OnTBTClientState;

@@ -353,4 +354,6 @@ public interface IProxyListenerBase  {
 	public void onOnInteriorVehicleData(OnInteriorVehicleData notification);

 

 	public void onSendHapticDataResponse(SendHapticDataResponse response);

+

+	public void onOnRCStatus(OnRCStatus notification);

 }

diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/ISdl.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/ISdl.java
index 13b5db958..22807fff0 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/ISdl.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/ISdl.java
@@ -7,6 +7,7 @@ import com.smartdevicelink.util.Version;
 import com.smartdevicelink.proxy.rpc.SdlMsgVersion;
 import com.smartdevicelink.proxy.rpc.enums.SystemCapabilityType;
 import com.smartdevicelink.proxy.rpc.listeners.OnMultipleRequestListener;
+import com.smartdevicelink.proxy.rpc.listeners.OnRPCListener;
 import com.smartdevicelink.proxy.rpc.listeners.OnRPCNotificationListener;
 import com.smartdevicelink.streaming.audio.AudioStreamingCodec;
 import com.smartdevicelink.streaming.audio.AudioStreamingParams;
@@ -151,6 +152,20 @@ public interface ISdl {
     boolean removeOnRPCNotificationListener(FunctionID notificationId, OnRPCNotificationListener listener);
 
     /**
+     * Add an OnRPCResponseListener for specified response
+     * @param responseId FunctionID of the response that is to be listened for
+     * @param listener listener that should be added for the response ID
+     */
+    void addOnRPCListener(FunctionID responseId, OnRPCListener listener);
+
+    /**
+     * Removes an OnRPCResponseListener for specified response
+     * @param responseId FunctionID of the response that was to be listened for
+     * @param listener listener that was previously added for the response ID
+     */
+    boolean removeOnRPCListener(FunctionID responseId, OnRPCListener listener);
+
+    /**
      * Get SystemCapability Object
      * @param systemCapabilityType
      * @return Object
@@ -172,6 +187,20 @@ public interface ISdl {
     boolean isCapabilitySupported(SystemCapabilityType systemCapabilityType);
 
     /**
+     * Add a listener to be called whenever a new capability is retrieved
+     * @param systemCapabilityType Type of capability desired
+     * @param listener callback to execute upon retrieving capability
+     */
+    void addOnSystemCapabilityListener(SystemCapabilityType systemCapabilityType, OnSystemCapabilityListener listener);
+
+    /**
+     * Remove an OnSystemCapabilityListener that was previously added
+     * @param systemCapabilityType Type of capability
+     * @param listener the listener that should be removed
+     */
+    boolean removeOnSystemCapabilityListener(SystemCapabilityType systemCapabilityType, OnSystemCapabilityListener listener);
+
+    /**
      * Get SdlMsgVersion
      * @return SdlMsgVersion
      */
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleData.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleData.java
index 293477e7c..8828831cc 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleData.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleData.java
@@ -254,6 +254,7 @@ public class GetVehicleData extends RPCRequest {
 	public static final String KEY_MY_KEY = "myKey";

 	public static final String KEY_FUEL_RANGE = "fuelRange";

 	public static final String KEY_TURN_SIGNAL = "turnSignal";

+	public static final String KEY_ELECTRONIC_PARK_BRAKE_STATUS = "electronicParkBrakeStatus";

 

 	/**

 	 * Constructs a new GetVehicleData object

@@ -469,9 +470,26 @@ public class GetVehicleData extends RPCRequest {
      * @param turnSignal a boolean value

      */

     public void setTurnSignal(Boolean turnSignal) { setParameters(KEY_TURN_SIGNAL, turnSignal); }

+

     /**

      * Gets a boolean value. If true, means the turnSignal data has been subscribed.

      * @return a Boolean value.

      */

     public Boolean getTurnSignal() { return getBoolean(KEY_TURN_SIGNAL); }

+

+    /**

+     * Sets a boolean value. If true, subscribes electronicParkBrakeStatus data

+     * @param electronicParkBrakeStatus a boolean value

+     */

+    public void setElectronicParkBrakeStatus(Boolean electronicParkBrakeStatus){

+        setParameters(KEY_ELECTRONIC_PARK_BRAKE_STATUS, electronicParkBrakeStatus);

+    }

+

+    /**

+     * Gets a boolean value. If true, means the electronicParkBrakeStatus data has been subscribed.

+     * @return a Boolean value.

+     */

+    public Boolean getElectronicParkBrakeStatus(){

+        return getBoolean(KEY_ELECTRONIC_PARK_BRAKE_STATUS);

+    }

 }

diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleDataResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleDataResponse.java
index 18159c464..91eefc13c 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleDataResponse.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleDataResponse.java
@@ -6,6 +6,7 @@ import android.support.annotation.NonNull;
 import com.smartdevicelink.protocol.enums.FunctionID;

 import com.smartdevicelink.proxy.RPCResponse;

 import com.smartdevicelink.proxy.rpc.enums.ComponentVolumeStatus;

+import com.smartdevicelink.proxy.rpc.enums.ElectronicParkBrakeStatus;

 import com.smartdevicelink.proxy.rpc.enums.PRNDL;

 import com.smartdevicelink.proxy.rpc.enums.Result;

 import com.smartdevicelink.proxy.rpc.enums.TurnSignal;

@@ -50,6 +51,7 @@ public class GetVehicleDataResponse extends RPCResponse {
 	public static final String KEY_MY_KEY = "myKey";

 	public static final String KEY_FUEL_RANGE = "fuelRange";

 	public static final String KEY_TURN_SIGNAL = "turnSignal";

+	public static final String KEY_ELECTRONIC_PARK_BRAKE_STATUS = "electronicParkBrakeStatus";

 

 	/** 

 	 * Constructs a new GetVehicleDataResponse object

@@ -295,4 +297,20 @@ public class GetVehicleDataResponse extends RPCResponse {
     public TurnSignal getTurnSignal() {

         return (TurnSignal) getObject(TurnSignal.class, KEY_TURN_SIGNAL);

     }

+

+    /**

+     * Sets electronicParkBrakeStatus

+     * @param electronicParkBrakeStatus

+     */

+    public void setElectronicParkBrakeStatus(ElectronicParkBrakeStatus electronicParkBrakeStatus){

+        setParameters(KEY_ELECTRONIC_PARK_BRAKE_STATUS, electronicParkBrakeStatus);

+    }

+

+    /**

+     * Gets electronicParkBrakeStatus

+     * @return ElectronicParkBrakeStatus

+     */

+    public ElectronicParkBrakeStatus getElectronicParkBrakeStatus(){

+        return (ElectronicParkBrakeStatus) getObject(ElectronicParkBrakeStatus.class, KEY_ELECTRONIC_PARK_BRAKE_STATUS);

+    }

 }

diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MassageCushionFirmness.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MassageCushionFirmness.java
new file mode 100644
index 000000000..8e87eff7d
--- /dev/null
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MassageCushionFirmness.java
@@ -0,0 +1,79 @@
+package com.smartdevicelink.proxy.rpc;
+
+import android.support.annotation.NonNull;
+
+import com.smartdevicelink.proxy.RPCStruct;
+import com.smartdevicelink.proxy.rpc.enums.MassageCushion;
+
+import java.util.Hashtable;
+
+/**
+ * The intensity or firmness of a cushion.
+ */
+public class MassageCushionFirmness extends RPCStruct {
+	public static final String KEY_CUSHION = "cushion";
+	public static final String KEY_FIRMNESS = "firmness";
+
+	/**
+	 * Constructs a new MassageCushionFirmness object
+	 */
+	public MassageCushionFirmness() {
+	}
+
+	/**
+	 * <p>Constructs a new MassageCushionFirmness object indicated by the Hashtable parameter
+	 * </p>
+	 *
+	 * @param hash The Hashtable to use
+	 */
+	public MassageCushionFirmness(Hashtable<String, Object> hash) {
+		super(hash);
+	}
+
+	/**
+	 * Constructs a newly allocated MassageCushionFirmness object
+	 * @param cushion  type of MassageCushion for multi-contour massage seat
+	 * @param firmness Min: 0  Max: 100
+	 */
+	public MassageCushionFirmness(@NonNull MassageCushion cushion, @NonNull Integer firmness) {
+		this();
+		setCushion(cushion);
+		setFirmness(firmness);
+	}
+
+	/**
+	 * Sets the cushion portion of the MassageCushionFirmness class
+	 *
+	 * @param cushion
+	 */
+	public void setCushion(@NonNull MassageCushion cushion) {
+		setValue(KEY_CUSHION, cushion);
+	}
+
+	/**
+	 * Gets the cushion portion of the MassageCushionFirmness class
+	 *
+	 * @return MassageCushion.
+	 */
+	public MassageCushion getCushion() {
+		return (MassageCushion) getObject(MassageCushion.class, KEY_CUSHION);
+	}
+
+	/**
+	 * Sets the firmness portion of the MassageCushionFirmness class
+	 *
+	 * @param firmness
+	 */
+	public void setFirmness(@NonNull Integer firmness) {
+		setValue(KEY_FIRMNESS, firmness);
+	}
+
+	/**
+	 * Gets the firmness portion of the MassageCushionFirmness class
+	 *
+	 * @return Integer
+	 */
+	public Integer getFirmness() {
+		return getInteger(KEY_FIRMNESS);
+	}
+}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MassageModeData.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MassageModeData.java
new file mode 100644
index 000000000..857d4dc7c
--- /dev/null
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/MassageModeData.java
@@ -0,0 +1,80 @@
+package com.smartdevicelink.proxy.rpc;
+
+import android.support.annotation.NonNull;
+
+import com.smartdevicelink.proxy.RPCStruct;
+import com.smartdevicelink.proxy.rpc.enums.MassageMode;
+import com.smartdevicelink.proxy.rpc.enums.MassageZone;
+
+import java.util.Hashtable;
+
+/**
+ * Specify the mode of a massage zone.
+ */
+public class MassageModeData extends RPCStruct {
+	public static final String KEY_MASSAGE_ZONE = "massageZone";
+	public static final String KEY_MASSAGE_MODE = "massageMode";
+
+	/**
+	 * Constructs a new MassageModeData object
+	 */
+	public MassageModeData() {
+	}
+
+	/**
+	 * <p>Constructs a new MassageModeData object indicated by the Hashtable parameter
+	 * </p>
+	 *
+	 * @param hash The Hashtable to use
+	 */
+	public MassageModeData(Hashtable<String, Object> hash) {
+		super(hash);
+	}
+
+	/**
+	 * Constructs a newly allocated MassageModeData object
+	 * @param massageZone type of MassageZone for multi-contour massage seat
+	 * @param massageMode mode of massage zone.
+	 */
+	public MassageModeData(@NonNull MassageZone massageZone, @NonNull MassageMode massageMode) {
+		this();
+		setMassageZone(massageZone);
+		setMassageMode(massageMode);
+	}
+
+	/**
+	 * Sets the massageZone portion of the MassageModeData class
+	 *
+	 * @param massageZone
+	 */
+	public void setMassageZone(@NonNull MassageZone massageZone) {
+		setValue(KEY_MASSAGE_ZONE, massageZone);
+	}
+
+	/**
+	 * Gets the massageZone portion of the MassageModeData class
+	 *
+	 * @return MassageZone.
+	 */
+	public MassageZone getMassageZone() {
+		return (MassageZone) getObject(MassageZone.class, KEY_MASSAGE_ZONE);
+	}
+
+	/**
+	 * Gets the massageMode portion of the MassageModeData class
+	 *
+	 * @return MassageMode
+	 */
+	public MassageMode getMassageMode() {
+		return (MassageMode) getObject(MassageMode.class, KEY_MASSAGE_MODE);
+	}
+
+	/**
+	 * Sets the massageMode portion of the MassageModeData class
+	 *
+	 * @param massageMode
+	 */
+	public void setMassageMode(@NonNull MassageMode massageMode) {
+		setValue(KEY_MASSAGE_MODE, massageMode);
+	}
+}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ModuleData.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ModuleData.java
index 9ae3f7fd3..b21c60be2 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ModuleData.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ModuleData.java
@@ -4,81 +4,98 @@ import android.support.annotation.NonNull;
 
 import com.smartdevicelink.proxy.RPCStruct;
 import com.smartdevicelink.proxy.rpc.enums.ModuleType;
-import com.smartdevicelink.proxy.rpc.enums.Result;
 
 import java.util.Hashtable;
 
-public class ModuleData extends RPCStruct{
-    public static final String KEY_MODULE_TYPE= "moduleType";
-    public static final String KEY_RADIO_CONTROL_DATA = "radioControlData";
-    public static final String KEY_CLIMATE_CONTROL_DATA = "climateControlData";
+public class ModuleData extends RPCStruct {
+	public static final String KEY_MODULE_TYPE = "moduleType";
+	public static final String KEY_RADIO_CONTROL_DATA = "radioControlData";
+	public static final String KEY_CLIMATE_CONTROL_DATA = "climateControlData";
+	public static final String KEY_SEAT_CONTROL_DATA = "seatControlData";
 
-    public ModuleData() {
-    }
+	public ModuleData() {
+	}
 
-    public ModuleData(Hashtable<String, Object> hash) {
-        super(hash);
-    }
+	public ModuleData(Hashtable<String, Object> hash) {
+		super(hash);
+	}
 
-    public ModuleData(@NonNull ModuleType moduleType) {
-        this();
-        setModuleType(moduleType);
-    }
+	public ModuleData(@NonNull ModuleType moduleType) {
+		this();
+		setModuleType(moduleType);
+	}
 
-    /**
-     * Sets the moduleType portion of the ModuleData class
-     *
-     * @param moduleType
-     * The moduleType indicates which type of data should be changed and identifies which data object exists in this struct.
-     * For example, if the moduleType is CLIMATE then a "climateControlData" should exist
-     */
-    public void setModuleType(@NonNull ModuleType moduleType) {
-        setValue(KEY_MODULE_TYPE, moduleType);
-    }
+	/**
+	 * Sets the moduleType portion of the ModuleData class
+	 *
+	 * @param moduleType The moduleType indicates which type of data should be changed and identifies which data object exists in this struct.
+	 *                   For example, if the moduleType is CLIMATE then a "climateControlData" should exist
+	 */
+	public void setModuleType(@NonNull ModuleType moduleType) {
+		setValue(KEY_MODULE_TYPE, moduleType);
+	}
 
-    /**
-     * Gets the moduleType portion of the ModuleData class
-     *
-     * @return ModuleType - The moduleType indicates which type of data should be changed and identifies which data object exists in this struct.
-     * For example, if the moduleType is CLIMATE then a "climateControlData" should exist.
-     */
-    public ModuleType getModuleType() {
-        return (ModuleType) getObject(ModuleType.class, KEY_MODULE_TYPE);
-    }
+	/**
+	 * Gets the moduleType portion of the ModuleData class
+	 *
+	 * @return ModuleType - The moduleType indicates which type of data should be changed and identifies which data object exists in this struct.
+	 * For example, if the moduleType is CLIMATE then a "climateControlData" should exist.
+	 */
+	public ModuleType getModuleType() {
+		return (ModuleType) getObject(ModuleType.class, KEY_MODULE_TYPE);
+	}
 
-    /**
-     * Sets the radioControlData portion of the ModuleData class
-     *
-     * @param radioControlData
-     */
-    public void setRadioControlData(RadioControlData radioControlData) {
-        setValue(KEY_RADIO_CONTROL_DATA, radioControlData);
-    }
+	/**
+	 * Sets the radioControlData portion of the ModuleData class
+	 *
+	 * @param radioControlData
+	 */
+	public void setRadioControlData(RadioControlData radioControlData) {
+		setValue(KEY_RADIO_CONTROL_DATA, radioControlData);
+	}
 
-    /**
-     * Gets the radioControlData portion of the ModuleData class
-     *
-     * @return RadioControlData
-     */
-    public RadioControlData getRadioControlData() {
-        return (RadioControlData) getObject(RadioControlData.class, KEY_RADIO_CONTROL_DATA);
-    }
+	/**
+	 * Gets the radioControlData portion of the ModuleData class
+	 *
+	 * @return RadioControlData
+	 */
+	public RadioControlData getRadioControlData() {
+		return (RadioControlData) getObject(RadioControlData.class, KEY_RADIO_CONTROL_DATA);
+	}
 
-    /**
-     * Sets the climateControlData portion of the ModuleData class
-     *
-     * @param climateControlData
-     */
-    public void setClimateControlData(ClimateControlData climateControlData) {
-        setValue(KEY_CLIMATE_CONTROL_DATA, climateControlData);
-    }
+	/**
+	 * Sets the climateControlData portion of the ModuleData class
+	 *
+	 * @param climateControlData
+	 */
+	public void setClimateControlData(ClimateControlData climateControlData) {
+		setValue(KEY_CLIMATE_CONTROL_DATA, climateControlData);
+	}
 
-    /**
-     * Gets the climateControlData portion of the ModuleData class
-     *
-     * @return ClimateControlData
-     */
-    public ClimateControlData getClimateControlData() {
-        return (ClimateControlData) getObject(ClimateControlData.class, KEY_CLIMATE_CONTROL_DATA);
-    }
+	/**
+	 * Gets the climateControlData portion of the ModuleData class
+	 *
+	 * @return ClimateControlData
+	 */
+	public ClimateControlData getClimateControlData() {
+		return (ClimateControlData) getObject(ClimateControlData.class, KEY_CLIMATE_CONTROL_DATA);
+	}
+
+	/**
+	 * Sets the seatControlData portion of the ModuleData class
+	 *
+	 * @param seatControlData
+	 */
+	public void setSeatControlData(SeatControlData seatControlData) {
+		setValue(KEY_SEAT_CONTROL_DATA, seatControlData);
+	}
+
+	/**
+	 * Gets the seatControlData portion of the ModuleData class
+	 *
+	 * @return SeatControlData
+	 */
+	public SeatControlData getSeatControlData() {
+		return (SeatControlData) getObject(SeatControlData.class, KEY_SEAT_CONTROL_DATA);
+	}
 }
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnRCStatus.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnRCStatus.java
new file mode 100644
index 000000000..8be1e0007
--- /dev/null
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnRCStatus.java
@@ -0,0 +1,69 @@
+package com.smartdevicelink.proxy.rpc;
+
+import android.support.annotation.NonNull;
+
+import com.smartdevicelink.protocol.enums.FunctionID;
+import com.smartdevicelink.proxy.RPCNotification;
+
+import java.util.Hashtable;
+import java.util.List;
+
+public class OnRCStatus extends RPCNotification {
+	public static final String KEY_ALLOCATED_MODULES = "allocatedModules";
+	public static final String KEY_FREE_MODULES = "freeModules";
+	public static final String KEY_ALLOWED = "allowed";
+
+	/**
+	 * Constructs a new OnRCStatus object
+	 */
+	public OnRCStatus() {
+		super(FunctionID.ON_RC_STATUS.toString());
+	}
+
+	/**
+	 * Constructs a new OnRCStatus object indicated by the Hashtable
+	 * parameter
+	 * @param hash The Hashtable to use
+	 */
+	public OnRCStatus(Hashtable<String, Object> hash) {
+		super(hash);
+	}
+
+	/**
+	 * Constructs a newly allocated OnRCStatus object
+	 *
+	 * @param allocatedModules Contains a list (zero or more) of module types that are allocated to the application.
+	 * @param freeModules      Contains a list (zero or more) of module types that are free to access for the application.
+	 */
+	public OnRCStatus(@NonNull List<ModuleData> allocatedModules, @NonNull List<ModuleData> freeModules) {
+		this();
+		setAllocatedModules(allocatedModules);
+		setFreeModules(freeModules);
+	}
+
+	@SuppressWarnings("unchecked")
+	public List<ModuleData> getAllocatedModules() {
+		return (List<ModuleData>) getObject(ModuleData.class, KEY_ALLOCATED_MODULES);
+	}
+
+	public void setAllocatedModules(@NonNull List<ModuleData> allocatedModules) {
+		setParameters(KEY_ALLOCATED_MODULES, allocatedModules);
+	}
+
+	@SuppressWarnings("unchecked")
+	public List<ModuleData> getFreeModules() {
+		return (List<ModuleData>) getObject(ModuleData.class, KEY_FREE_MODULES);
+	}
+
+	public void setFreeModules(@NonNull List<ModuleData> freeModules) {
+		setParameters(KEY_FREE_MODULES, freeModules);
+	}
+
+	public Boolean getAllowed() {
+		return getBoolean(KEY_ALLOWED);
+	}
+
+	public void setAllowed(Boolean allowed) {
+		setParameters(KEY_ALLOWED, allowed);
+	}
+}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnVehicleData.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnVehicleData.java
index 1f066a23a..550c4f626 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnVehicleData.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnVehicleData.java
@@ -6,6 +6,7 @@ import java.util.List;
 import com.smartdevicelink.protocol.enums.FunctionID;

 import com.smartdevicelink.proxy.RPCNotification;

 import com.smartdevicelink.proxy.rpc.enums.ComponentVolumeStatus;

+import com.smartdevicelink.proxy.rpc.enums.ElectronicParkBrakeStatus;

 import com.smartdevicelink.proxy.rpc.enums.PRNDL;

 import com.smartdevicelink.proxy.rpc.enums.TurnSignal;

 import com.smartdevicelink.proxy.rpc.enums.VehicleDataEventStatus;

@@ -285,6 +286,7 @@ public class OnVehicleData extends RPCNotification {
 	public static final String KEY_MY_KEY = "myKey";

 	public static final String KEY_FUEL_RANGE = "fuelRange";

 	public static final String KEY_TURN_SIGNAL = "turnSignal";

+	public static final String KEY_ELECTRONIC_PARK_BRAKE_STATUS = "electronicParkBrakeStatus";

 

     public OnVehicleData() {

         super(FunctionID.ON_VEHICLE_DATA.toString());

@@ -510,4 +512,20 @@ public class OnVehicleData extends RPCNotification {
     public TurnSignal getTurnSignal() {

         return (TurnSignal) getObject(TurnSignal.class, KEY_TURN_SIGNAL);

     }

+

+    /**

+     * Sets electronicParkBrakeStatus

+     * @param electronicParkBrakeStatus

+     */

+    public void setElectronicParkBrakeStatus(ElectronicParkBrakeStatus electronicParkBrakeStatus){

+        setParameters(KEY_ELECTRONIC_PARK_BRAKE_STATUS, electronicParkBrakeStatus);

+    }

+

+    /**

+     * Gets electronicParkBrakeStatus

+     * @return ElectronicParkBrakeStatus

+     */

+    public ElectronicParkBrakeStatus getElectronicParkBrakeStatus(){

+        return (ElectronicParkBrakeStatus) getObject(ElectronicParkBrakeStatus.class, KEY_ELECTRONIC_PARK_BRAKE_STATUS);

+    }

 }

diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RemoteControlCapabilities.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RemoteControlCapabilities.java
index ec51aa633..8a2106f6e 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RemoteControlCapabilities.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/RemoteControlCapabilities.java
@@ -1,82 +1,100 @@
 package com.smartdevicelink.proxy.rpc;
 
 import com.smartdevicelink.proxy.RPCStruct;
+
 import java.util.Hashtable;
 import java.util.List;
 
-public class RemoteControlCapabilities extends RPCStruct{
-    public static final String KEY_CLIMATE_CONTROL_CAPABILITIES= "climateControlCapabilities";
-    public static final String KEY_RADIO_CONTROL_CAPABILITIES = "radioControlCapabilities";
-    public static final String KEY_BUTTON_CAPABILITIES = "buttonCapabilities";
+public class RemoteControlCapabilities extends RPCStruct {
+	public static final String KEY_CLIMATE_CONTROL_CAPABILITIES = "climateControlCapabilities";
+	public static final String KEY_RADIO_CONTROL_CAPABILITIES = "radioControlCapabilities";
+	public static final String KEY_BUTTON_CAPABILITIES = "buttonCapabilities";
+	public static final String KEY_SEAT_CONTROL_CAPABILITIES = "seatControlCapabilities";
+
+	public RemoteControlCapabilities() {
+	}
+
+	public RemoteControlCapabilities(Hashtable<String, Object> hash) {
+		super(hash);
+	}
 
-    public RemoteControlCapabilities() {
-    }
+	/**
+	 * Sets the climateControlCapabilities portion of the RemoteControlCapabilities class
+	 *
+	 * @param climateControlCapabilities If included, the platform supports RC climate controls.
+	 *                                   For this baseline version, maxsize=1. i.e. only one climate control module is supported.
+	 */
+	public void setClimateControlCapabilities(List<ClimateControlCapabilities> climateControlCapabilities) {
+		setValue(KEY_CLIMATE_CONTROL_CAPABILITIES, climateControlCapabilities);
+	}
 
-    public RemoteControlCapabilities(Hashtable<String, Object> hash) {
-        super(hash);
-    }
+	/**
+	 * Gets the climateControlCapabilities portion of the RemoteControlCapabilities class
+	 *
+	 * @return List<ClimateControlCapabilities>
+	 * If included, the platform supports RC climate controls.
+	 * For this baseline version, maxsize=1. i.e. only one climate control module is supported.
+	 */
+	public List<ClimateControlCapabilities> getClimateControlCapabilities() {
+		return (List<ClimateControlCapabilities>) getObject(ClimateControlCapabilities.class, KEY_CLIMATE_CONTROL_CAPABILITIES);
+	}
 
-    /**
-     * Sets the climateControlCapabilities portion of the RemoteControlCapabilities class
-     *
-     * @param climateControlCapabilities
-     * If included, the platform supports RC climate controls.
-     * For this baseline version, maxsize=1. i.e. only one climate control module is supported.
-     */
-    public void setClimateControlCapabilities(List<ClimateControlCapabilities> climateControlCapabilities) {
-        setValue(KEY_CLIMATE_CONTROL_CAPABILITIES, climateControlCapabilities);
-    }
+	/**
+	 * Sets the radioControlCapabilities portion of the RemoteControlCapabilities class
+	 *
+	 * @param radioControlCapabilities If included, the platform supports RC climate controls.
+	 *                                 For this baseline version, maxsize=1. i.e. only one radio control module is supported.
+	 */
+	public void setRadioControlCapabilities(List<RadioControlCapabilities> radioControlCapabilities) {
+		setValue(KEY_RADIO_CONTROL_CAPABILITIES, radioControlCapabilities);
+	}
 
-    /**
-     * Gets the climateControlCapabilities portion of the RemoteControlCapabilities class
-     *
-     * @return List<ClimateControlCapabilities>
-     * If included, the platform supports RC climate controls.
-     * For this baseline version, maxsize=1. i.e. only one climate control module is supported.
-     */
-    public List<ClimateControlCapabilities> getClimateControlCapabilities() {
-        return (List<ClimateControlCapabilities>) getObject(ClimateControlCapabilities.class, KEY_CLIMATE_CONTROL_CAPABILITIES);
-    }
+	/**
+	 * Gets the radioControlCapabilities portion of the RemoteControlCapabilities class
+	 *
+	 * @return List<RadioControlCapabilities>
+	 * If included, the platform supports RC climate controls.
+	 * For this baseline version, maxsize=1. i.e. only one radio control module is supported.
+	 */
+	public List<RadioControlCapabilities> getRadioControlCapabilities() {
+		return (List<RadioControlCapabilities>) getObject(RadioControlCapabilities.class, KEY_RADIO_CONTROL_CAPABILITIES);
+	}
 
-    /**
-     * Sets the radioControlCapabilities portion of the RemoteControlCapabilities class
-     *
-     * @param radioControlCapabilities
-     * If included, the platform supports RC climate controls.
-     * For this baseline version, maxsize=1. i.e. only one radio control module is supported.
-     */
-    public void setRadioControlCapabilities(List<RadioControlCapabilities> radioControlCapabilities) {
-        setValue(KEY_RADIO_CONTROL_CAPABILITIES, radioControlCapabilities);
-    }
+	/**
+	 * Sets the buttonCapabilities portion of the RemoteControlCapabilities class
+	 *
+	 * @param buttonCapabilities If included, the platform supports RC button controls with the included button names.
+	 */
+	public void setButtonCapabilities(List<ButtonCapabilities> buttonCapabilities) {
+		setValue(KEY_BUTTON_CAPABILITIES, buttonCapabilities);
+	}
 
-    /**
-     * Gets the radioControlCapabilities portion of the RemoteControlCapabilities class
-     *
-     * @return List<RadioControlCapabilities>
-     * If included, the platform supports RC climate controls.
-     * For this baseline version, maxsize=1. i.e. only one radio control module is supported.
-     */
-    public List<RadioControlCapabilities> getRadioControlCapabilities() {
-        return (List<RadioControlCapabilities>) getObject(RadioControlCapabilities.class, KEY_RADIO_CONTROL_CAPABILITIES);
-    }
+	/**
+	 * Gets the buttonCapabilities portion of the RemoteControlCapabilities class
+	 *
+	 * @return List<ButtonCapabilities>
+	 * If included, the platform supports RC button controls with the included button names.
+	 */
+	public List<ButtonCapabilities> getButtonCapabilities() {
+		return (List<ButtonCapabilities>) getObject(ButtonCapabilities.class, KEY_BUTTON_CAPABILITIES);
+	}
 
-    /**
-     * Sets the buttonCapabilities portion of the RemoteControlCapabilities class
-     *
-     * @param buttonCapabilities
-     * If included, the platform supports RC button controls with the included button names.
-     */
-    public void setButtonCapabilities(List<ButtonCapabilities> buttonCapabilities) {
-        setValue(KEY_BUTTON_CAPABILITIES, buttonCapabilities);
-    }
+	/**
+	 * Sets the seatControlCapabilities portion of the RemoteControlCapabilities class
+	 *
+	 * @param seatControlCapabilities If included, the platform supports seat controls.
+	 */
+	public void setSeatControlCapabilities(List<SeatControlCapabilities> seatControlCapabilities) {
+		setValue(KEY_SEAT_CONTROL_CAPABILITIES, seatControlCapabilities);
+	}
 
-    /**
-     * Gets the buttonCapabilities portion of the RemoteControlCapabilities class
-     *
-     * @return List<ButtonCapabilities>
-     * If included, the platform supports RC button controls with the included button names.
-     */
-    public List<ButtonCapabilities> getButtonCapabilities() {
-        return (List<ButtonCapabilities>) getObject(ButtonCapabilities.class, KEY_BUTTON_CAPABILITIES);
-    }
+	/**
+	 * Gets the seatControlCapabilities portion of the RemoteControlCapabilities class
+	 *
+	 * @return List<SeatControlCapabilities>
+	 * If included, the platform supports seat controls.
+	 */
+	public List<SeatControlCapabilities> getSeatControlCapabilities() {
+		return (List<SeatControlCapabilities>) getObject(SeatControlCapabilities.class, KEY_SEAT_CONTROL_CAPABILITIES);
+	}
 }
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SeatControlCapabilities.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SeatControlCapabilities.java
new file mode 100644
index 000000000..e1d488cb5
--- /dev/null
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SeatControlCapabilities.java
@@ -0,0 +1,339 @@
+package com.smartdevicelink.proxy.rpc;
+
+import android.support.annotation.NonNull;
+
+import com.smartdevicelink.proxy.RPCStruct;
+
+import java.util.Hashtable;
+
+public class SeatControlCapabilities extends RPCStruct {
+	public static final String KEY_MODULE_NAME = "moduleName";
+	public static final String KEY_HEATING_ENABLED_AVAILABLE = "heatingEnabledAvailable";
+	public static final String KEY_COOLING_ENABLED_AVAILABLE = "coolingEnabledAvailable";
+	public static final String KEY_HEATING_LEVEL_AVAILABLE = "heatingLevelAvailable";
+	public static final String KEY_COOLING_LEVEL_AVAILABLE = "coolingLevelAvailable";
+	public static final String KEY_HORIZONTAL_POSITION_AVAILABLE = "horizontalPositionAvailable";
+	public static final String KEY_VERTICAL_POSITION_AVAILABLE = "verticalPositionAvailable";
+	public static final String KEY_FRONT_VERTICAL_POSITION_AVAILABLE = "frontVerticalPositionAvailable";
+	public static final String KEY_BACK_VERTICAL_POSITION_AVAILABLE = "backVerticalPositionAvailable";
+	public static final String KEY_BACK_TILT_ANGLE_AVAILABLE = "backTiltAngleAvailable";
+	public static final String KEY_HEAD_SUPPORT_HORIZONTAL_POSITION_AVAILABLE = "headSupportHorizontalPositionAvailable";
+	public static final String KEY_HEAD_SUPPORT_VERTICAL_POSITION_AVAILABLE = "headSupportVerticalPositionAvailable";
+	public static final String KEY_MASSAGE_ENABLED_AVAILABLE = "massageEnabledAvailable";
+	public static final String KEY_MASSAGE_MODE_AVAILABLE = "massageModeAvailable";
+	public static final String KEY_MASSAGE_CUSHION_FIRMNESS_AVAILABLE = "massageCushionFirmnessAvailable";
+	public static final String KEY_MEMORY_AVAILABLE = "memoryAvailable";
+
+	/**
+	 * Constructs a new SeatControlCapabilities object
+	 */
+	public SeatControlCapabilities() {
+	}
+
+	/**
+	 * <p>Constructs a new SeatControlCapabilities object indicated by the Hashtable parameter
+	 * </p>
+	 *
+	 * @param hash The Hashtable to use
+	 */
+	public SeatControlCapabilities(Hashtable<String, Object> hash) {
+		super(hash);
+	}
+
+	/**
+	 * Constructs a newly allocated SeatControlCapabilities object
+	 * @param moduleName short friendly name of the light control module.
+	 */
+	public SeatControlCapabilities(@NonNull String moduleName) {
+		this();
+		setModuleName(moduleName);
+	}
+
+	/**
+	 * Get the moduleName portion of the SeatControlCapabilities class
+	 *
+	 * @return String
+	 */
+	public String getModuleName() {
+		return getString(KEY_MODULE_NAME);
+	}
+
+	/**
+	 * Sets the moduleName portion of the SeatControlCapabilities class
+	 *
+	 * @param moduleName -  The short friendly name of the light control module. It should not be used to identify a module by mobile application.
+	 */
+	public void setModuleName(@NonNull String moduleName) {
+		setValue(KEY_MODULE_NAME, moduleName);
+	}
+
+	/**
+	 * Sets the heatingEnabledAvailable portion of the SeatControlCapabilities class
+	 *
+	 * @param heatingEnabledAvailable
+	 */
+	public void setHeatingEnabledAvailable(Boolean heatingEnabledAvailable) {
+		setValue(KEY_HEATING_ENABLED_AVAILABLE, heatingEnabledAvailable);
+	}
+
+	/**
+	 * Gets the heatingEnabledAvailable portion of the SeatControlCapabilities class
+	 *
+	 * @return Boolean.
+	 */
+	public Boolean getHeatingEnabledAvailable() {
+		return getBoolean(KEY_HEATING_ENABLED_AVAILABLE);
+	}
+
+	/**
+	 * Sets the coolingEnabledAvailable portion of the SeatControlCapabilities class
+	 *
+	 * @param coolingEnabledAvailable
+	 */
+	public void setCoolingEnabledAvailable(Boolean coolingEnabledAvailable) {
+		setValue(KEY_COOLING_ENABLED_AVAILABLE, coolingEnabledAvailable);
+	}
+
+	/**
+	 * Gets the coolingEnabledAvailable portion of the SeatControlCapabilities class
+	 *
+	 * @return Boolean.
+	 */
+	public Boolean getCoolingEnabledAvailable() {
+		return getBoolean(KEY_COOLING_ENABLED_AVAILABLE);
+	}
+
+	/**
+	 * Sets the heatingLevelAvailable portion of the SeatControlCapabilities class
+	 *
+	 * @param heatingLevelAvailable
+	 */
+	public void setHeatingLevelAvailable(Boolean heatingLevelAvailable) {
+		setValue(KEY_HEATING_LEVEL_AVAILABLE, heatingLevelAvailable);
+	}
+
+	/**
+	 * Gets the heatingLevelAvailable portion of the SeatControlCapabilities class
+	 *
+	 * @return Boolean.
+	 */
+	public Boolean getHeatingLevelAvailable() {
+		return getBoolean(KEY_HEATING_LEVEL_AVAILABLE);
+	}
+
+	/**
+	 * Sets the coolingLevelAvailable portion of the SeatControlCapabilities class
+	 *
+	 * @param coolingLevelAvailable
+	 */
+	public void setCoolingLevelAvailable(Boolean coolingLevelAvailable) {
+		setValue(KEY_COOLING_LEVEL_AVAILABLE, coolingLevelAvailable);
+	}
+
+	/**
+	 * Gets the coolingLevelAvailable portion of the SeatControlCapabilities class
+	 *
+	 * @return Boolean.
+	 */
+	public Boolean getCoolingLevelAvailable() {
+		return getBoolean(KEY_COOLING_LEVEL_AVAILABLE);
+	}
+
+	/**
+	 * Sets the horizontalPositionAvailable portion of the SeatControlCapabilities class
+	 *
+	 * @param horizontalPositionAvailable
+	 */
+	public void setHorizontalPositionAvailable(Boolean horizontalPositionAvailable) {
+		setValue(KEY_HORIZONTAL_POSITION_AVAILABLE, horizontalPositionAvailable);
+	}
+
+	/**
+	 * Gets the horizontalPositionAvailable portion of the SeatControlCapabilities class
+	 *
+	 * @return Boolean.
+	 */
+	public Boolean getHorizontalPositionAvailable() {
+		return getBoolean(KEY_HORIZONTAL_POSITION_AVAILABLE);
+	}
+
+	/**
+	 * Sets the verticalPositionAvailable portion of the SeatControlCapabilities class
+	 *
+	 * @param verticalPositionAvailable
+	 */
+	public void setVerticalPositionAvailable(Boolean verticalPositionAvailable) {
+		setValue(KEY_VERTICAL_POSITION_AVAILABLE, verticalPositionAvailable);
+	}
+
+	/**
+	 * Gets the verticalPositionAvailable portion of the SeatControlCapabilities class
+	 *
+	 * @return Boolean.
+	 */
+	public Boolean getVerticalPositionAvailable() {
+		return getBoolean(KEY_VERTICAL_POSITION_AVAILABLE);
+	}
+
+	/**
+	 * Sets the frontVerticalPositionAvailable portion of the SeatControlCapabilities class
+	 *
+	 * @param frontVerticalPositionAvailable
+	 */
+	public void setFrontVerticalPositionAvailable(Boolean frontVerticalPositionAvailable) {
+		setValue(KEY_FRONT_VERTICAL_POSITION_AVAILABLE, frontVerticalPositionAvailable);
+	}
+
+	/**
+	 * Gets the frontVerticalPositionAvailable portion of the SeatControlCapabilities class
+	 *
+	 * @return Boolean.
+	 */
+	public Boolean getFrontVerticalPositionAvailable() {
+		return getBoolean(KEY_FRONT_VERTICAL_POSITION_AVAILABLE);
+	}
+
+	/**
+	 * Sets the backVerticalPositionAvailable portion of the SeatControlCapabilities class
+	 *
+	 * @param backVerticalPositionAvailable
+	 */
+	public void setBackVerticalPositionAvailable(Boolean backVerticalPositionAvailable) {
+		setValue(KEY_BACK_VERTICAL_POSITION_AVAILABLE, backVerticalPositionAvailable);
+	}
+
+	/**
+	 * Gets the backVerticalPositionAvailable portion of the SeatControlCapabilities class
+	 *
+	 * @return Boolean.
+	 */
+	public Boolean getBackVerticalPositionAvailable() {
+		return getBoolean(KEY_BACK_VERTICAL_POSITION_AVAILABLE);
+	}
+
+	/**
+	 * Sets the backTiltAngleAvailable portion of the SeatControlCapabilities class
+	 *
+	 * @param backTiltAngleAvailable
+	 */
+	public void setBackTiltAngleAvailable(Boolean backTiltAngleAvailable) {
+		setValue(KEY_BACK_TILT_ANGLE_AVAILABLE, backTiltAngleAvailable);
+	}
+
+	/**
+	 * Gets the backTiltAngleAvailable portion of the SeatControlCapabilities class
+	 *
+	 * @return Boolean.
+	 */
+	public Boolean getBackTiltAngleAvailable() {
+		return getBoolean(KEY_BACK_TILT_ANGLE_AVAILABLE);
+	}
+
+	/**
+	 * Sets the headSupportHorizontalPositionAvailable portion of the SeatControlCapabilities class
+	 *
+	 * @param headSupportHorizontalPositionAvailable
+	 */
+	public void setHeadSupportHorizontalPositionAvailable(Boolean headSupportHorizontalPositionAvailable) {
+		setValue(KEY_HEAD_SUPPORT_HORIZONTAL_POSITION_AVAILABLE, headSupportHorizontalPositionAvailable);
+	}
+
+	/**
+	 * Gets the headSupportHorizontalPositionAvailable portion of the SeatControlCapabilities class
+	 *
+	 * @return Boolean.
+	 */
+	public Boolean getHeadSupportHorizontalPositionAvailable() {
+		return getBoolean(KEY_HEAD_SUPPORT_HORIZONTAL_POSITION_AVAILABLE);
+	}
+
+	/**
+	 * Sets the headSupportVerticalPositionAvailable portion of the SeatControlCapabilities class
+	 *
+	 * @param headSupportVerticalPositionAvailable
+	 */
+	public void setHeadSupportVerticalPositionAvailable(Boolean headSupportVerticalPositionAvailable) {
+		setValue(KEY_HEAD_SUPPORT_VERTICAL_POSITION_AVAILABLE, headSupportVerticalPositionAvailable);
+	}
+
+	/**
+	 * Gets the headSupportVerticalPositionAvailable portion of the SeatControlCapabilities class
+	 *
+	 * @return Boolean.
+	 */
+	public Boolean getHeadSupportVerticalPositionAvailable() {
+		return getBoolean(KEY_HEAD_SUPPORT_VERTICAL_POSITION_AVAILABLE);
+	}
+
+	/**
+	 * Sets the massageEnabledAvailable portion of the SeatControlCapabilities class
+	 *
+	 * @param massageEnabledAvailable
+	 */
+	public void setMassageEnabledAvailable(Boolean massageEnabledAvailable) {
+		setValue(KEY_MASSAGE_ENABLED_AVAILABLE, massageEnabledAvailable);
+	}
+
+	/**
+	 * Gets the massageEnabledAvailable portion of the SeatControlCapabilities class
+	 *
+	 * @return Boolean.
+	 */
+	public Boolean getMassageEnabledAvailable() {
+		return getBoolean(KEY_MASSAGE_ENABLED_AVAILABLE);
+	}
+
+	/**
+	 * Sets the massageModeAvailable portion of the SeatControlCapabilities class
+	 *
+	 * @param massageModeAvailable
+	 */
+	public void setMassageModeAvailable(Boolean massageModeAvailable) {
+		setValue(KEY_MASSAGE_MODE_AVAILABLE, massageModeAvailable);
+	}
+
+	/**
+	 * Gets the massageModeAvailable portion of the SeatControlCapabilities class
+	 *
+	 * @return Boolean.
+	 */
+	public Boolean getMassageModeAvailable() {
+		return getBoolean(KEY_MASSAGE_MODE_AVAILABLE);
+	}
+
+	/**
+	 * Sets the massageCushionFirmnessAvailable portion of the SeatControlCapabilities class
+	 *
+	 * @param massageCushionFirmnessAvailable
+	 */
+	public void setMassageCushionFirmnessAvailable(Boolean massageCushionFirmnessAvailable) {
+		setValue(KEY_MASSAGE_CUSHION_FIRMNESS_AVAILABLE, massageCushionFirmnessAvailable);
+	}
+
+	/**
+	 * Gets the massageCushionFirmnessAvailable portion of the SeatControlCapabilities class
+	 *
+	 * @return Boolean.
+	 */
+	public Boolean getMassageCushionFirmnessAvailable() {
+		return getBoolean(KEY_MASSAGE_CUSHION_FIRMNESS_AVAILABLE);
+	}
+
+	/**
+	 * Sets the memoryAvailable portion of the SeatControlCapabilities class
+	 *
+	 * @param memoryAvailable
+	 */
+	public void setMemoryAvailable(Boolean memoryAvailable) {
+		setValue(KEY_MEMORY_AVAILABLE, memoryAvailable);
+	}
+
+	/**
+	 * Gets the memoryAvailable portion of the SeatControlCapabilities class
+	 *
+	 * @return Boolean.
+	 */
+	public Boolean getMemoryAvailable() {
+		return getBoolean(KEY_MEMORY_AVAILABLE);
+	}
+}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SeatControlData.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SeatControlData.java
new file mode 100644
index 000000000..26d52d713
--- /dev/null
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SeatControlData.java
@@ -0,0 +1,347 @@
+package com.smartdevicelink.proxy.rpc;
+
+import android.support.annotation.NonNull;
+
+import com.smartdevicelink.proxy.RPCStruct;
+import com.smartdevicelink.proxy.rpc.enums.SupportedSeat;
+
+import java.util.Hashtable;
+import java.util.List;
+
+/**
+ * Seat control data corresponds to "SEAT" ModuleType.
+ */
+public class SeatControlData extends RPCStruct {
+	public static final String KEY_ID = "id";
+	public static final String KEY_HEATING_ENABLED = "heatingEnabled";
+	public static final String KEY_COOLING_ENABLED = "coolingEnabled";
+	public static final String KEY_HEATING_LEVEL = "heatingLevel";
+	public static final String KEY_COOLING_LEVEL = "coolingLevel";
+	public static final String KEY_HORIZONTAL_POSITION = "horizontalPosition";
+	public static final String KEY_VERTICAL_POSITION = "verticalPosition";
+	public static final String KEY_FRONT_VERTICAL_POSITION = "frontVerticalPosition";
+	public static final String KEY_BACK_VERTICAL_POSITION = "backVerticalPosition";
+	public static final String KEY_BACK_TILT_ANGLE = "backTiltAngle";
+	public static final String KEY_HEAD_SUPPORT_HORIZONTAL_POSITION = "headSupportHorizontalPosition";
+	public static final String KEY_HEAD_SUPPORT_VERTICAL_POSITION = "headSupportVerticalPosition";
+	public static final String KEY_MASSAGE_ENABLED = "massageEnabled";
+	public static final String KEY_MASSAGE_MODE = "massageMode";
+	public static final String KEY_MASSAGE_CUSHION_FIRMNESS = "massageCushionFirmness";
+	public static final String KEY_MEMORY = "memory";
+
+	/**
+	 * Constructs a new SeatControlData object
+	 */
+	public SeatControlData() {
+	}
+
+	/**
+	 * <p>Constructs a new SeatControlData object indicated by the Hashtable parameter
+	 * </p>
+	 *
+	 * @param hash The Hashtable to use
+	 */
+	public SeatControlData(Hashtable<String, Object> hash) {
+		super(hash);
+	}
+
+	/**
+	 * Constructs a newly allocated SeatControlData object
+	 * @param id type of SupportedSeat.
+	 */
+	public SeatControlData(@NonNull SupportedSeat id) {
+		this();
+		setId(id);
+	}
+
+	/**
+	 * Sets the id portion of the SeatControlData class
+	 *
+	 * @param id
+	 */
+	public void setId(@NonNull SupportedSeat id) {
+		setValue(KEY_ID, id);
+	}
+
+	/**
+	 * Gets the id portion of the SeatControlData class
+	 *
+	 * @return SupportedSeat.
+	 */
+	public SupportedSeat getId() {
+		return (SupportedSeat) getObject(SupportedSeat.class, KEY_ID);
+	}
+
+	/**
+	 * Sets the heatingEnabled portion of the SeatControlData class
+	 *
+	 * @param heatingEnabled
+	 */
+	public void setHeatingEnabled(Boolean heatingEnabled) {
+		setValue(KEY_HEATING_ENABLED, heatingEnabled);
+	}
+
+	/**
+	 * Gets the heatingEnabled portion of the SeatControlData class
+	 *
+	 * @return Boolean.
+	 */
+	public Boolean getHeatingEnabled() {
+		return getBoolean(KEY_HEATING_ENABLED);
+	}
+
+	/**
+	 * Sets the coolingEnabled portion of the SeatControlData class
+	 *
+	 * @param coolingEnabled
+	 */
+	public void setCoolingEnabled(Boolean coolingEnabled) {
+		setValue(KEY_COOLING_ENABLED, coolingEnabled);
+	}
+
+	/**
+	 * Gets the coolingEnabled portion of the SeatControlData class
+	 *
+	 * @return Boolean.
+	 */
+	public Boolean getCoolingEnabled() {
+		return getBoolean(KEY_COOLING_ENABLED);
+	}
+
+	/**
+	 * Sets the heatingLevel portion of the SeatControlData class
+	 *
+	 * @param heatingLevel
+	 */
+	public void setHeatingLevel(Integer heatingLevel) {
+		setValue(KEY_HEATING_LEVEL, heatingLevel);
+	}
+
+	/**
+	 * Gets the heatingLevel portion of the SeatControlData class
+	 *
+	 * @return Integer
+	 */
+	public Integer getHeatingLevel() {
+		return getInteger(KEY_HEATING_LEVEL);
+	}
+
+	/**
+	 * Sets the coolingLevel portion of the SeatControlData class
+	 *
+	 * @param coolingLevel
+	 */
+	public void setCoolingLevel(Integer coolingLevel) {
+		setValue(KEY_COOLING_LEVEL, coolingLevel);
+	}
+
+	/**
+	 * Gets the coolingLevel portion of the SeatControlData class
+	 *
+	 * @return Integer
+	 */
+	public Integer getCoolingLevel() {
+		return getInteger(KEY_COOLING_LEVEL);
+	}
+
+	/**
+	 * Sets the horizontalPosition portion of the SeatControlData class
+	 *
+	 * @param horizontalPosition
+	 */
+	public void setHorizontalPosition(Integer horizontalPosition) {
+		setValue(KEY_HORIZONTAL_POSITION, horizontalPosition);
+	}
+
+	/**
+	 * Gets the horizontalPosition portion of the SeatControlData class
+	 *
+	 * @return Integer
+	 */
+	public Integer getHorizontalPosition() {
+		return getInteger(KEY_HORIZONTAL_POSITION);
+	}
+
+	/**
+	 * Sets the verticalPosition portion of the SeatControlData class
+	 *
+	 * @param verticalPosition
+	 */
+	public void setVerticalPosition(Integer verticalPosition) {
+		setValue(KEY_VERTICAL_POSITION, verticalPosition);
+	}
+
+	/**
+	 * Gets the verticalPosition portion of the SeatControlData class
+	 *
+	 * @return Integer
+	 */
+	public Integer getVerticalPosition() {
+		return getInteger(KEY_VERTICAL_POSITION);
+	}
+
+	/**
+	 * Sets the frontVerticalPosition portion of the SeatControlData class
+	 *
+	 * @param frontVerticalPosition
+	 */
+	public void setFrontVerticalPosition(Integer frontVerticalPosition) {
+		setValue(KEY_FRONT_VERTICAL_POSITION, frontVerticalPosition);
+	}
+
+	/**
+	 * Gets the frontVerticalPosition portion of the SeatControlData class
+	 *
+	 * @return Integer
+	 */
+	public Integer getFrontVerticalPosition() {
+		return getInteger(KEY_FRONT_VERTICAL_POSITION);
+	}
+
+	/**
+	 * Sets the backVerticalPosition portion of the SeatControlData class
+	 *
+	 * @param backVerticalPosition
+	 */
+	public void setBackVerticalPosition(Integer backVerticalPosition) {
+		setValue(KEY_BACK_VERTICAL_POSITION, backVerticalPosition);
+	}
+
+	/**
+	 * Gets the backVerticalPosition portion of the SeatControlData class
+	 *
+	 * @return Integer
+	 */
+	public Integer getBackVerticalPosition() {
+		return getInteger(KEY_BACK_VERTICAL_POSITION);
+	}
+
+	/**
+	 * Sets the backTiltAngle portion of the SeatControlData class
+	 *
+	 * @param backTiltAngle
+	 */
+	public void setBackTiltAngle(Integer backTiltAngle) {
+		setValue(KEY_BACK_TILT_ANGLE, backTiltAngle);
+	}
+
+	/**
+	 * Gets the backTiltAngle portion of the SeatControlData class
+	 *
+	 * @return Integer
+	 */
+	public Integer getBackTiltAngle() {
+		return getInteger(KEY_BACK_TILT_ANGLE);
+	}
+
+	/**
+	 * Sets the headSupportHorizontalPosition portion of the SeatControlData class
+	 *
+	 * @param headSupportHorizontalPosition
+	 */
+	public void setHeadSupportHorizontalPosition(Integer headSupportHorizontalPosition) {
+		setValue(KEY_HEAD_SUPPORT_HORIZONTAL_POSITION, headSupportHorizontalPosition);
+	}
+
+	/**
+	 * Gets the headSupportHorizontalPosition portion of the SeatControlData class
+	 *
+	 * @return Integer
+	 */
+	public Integer getHeadSupportHorizontalPosition() {
+		return getInteger(KEY_HEAD_SUPPORT_HORIZONTAL_POSITION);
+	}
+
+	/**
+	 * Sets the headSupportVerticalPosition portion of the SeatControlData class
+	 *
+	 * @param headSupportVerticalPosition
+	 */
+	public void setHeadSupportVerticalPosition(Integer headSupportVerticalPosition) {
+		setValue(KEY_HEAD_SUPPORT_VERTICAL_POSITION, headSupportVerticalPosition);
+	}
+
+	/**
+	 * Gets the headSupportVerticalPosition portion of the SeatControlData class
+	 *
+	 * @return Integer
+	 */
+	public Integer getHeadSupportVerticalPosition() {
+		return getInteger(KEY_HEAD_SUPPORT_VERTICAL_POSITION);
+	}
+
+	/**
+	 * Sets the massageEnabled portion of the SeatControlData class
+	 *
+	 * @param massageEnabled
+	 */
+	public void setMassageEnabled(Boolean massageEnabled) {
+		setValue(KEY_MASSAGE_ENABLED, massageEnabled);
+	}
+
+	/**
+	 * Gets the massageEnabled portion of the SeatControlData class
+	 *
+	 * @return Boolean.
+	 */
+	public Boolean getMassageEnabled() {
+		return getBoolean(KEY_MASSAGE_ENABLED);
+	}
+
+	/**
+	 * Gets the List<MassageModeData> portion of the SeatControlData class
+	 *
+	 * @return List<MassageModeData>.
+	 */
+	@SuppressWarnings("unchecked")
+	public List<MassageModeData> getMassageMode() {
+		return (List<MassageModeData>) getObject(MassageModeData.class, KEY_MASSAGE_MODE);
+	}
+
+	/**
+	 * Sets the massageMode portion of the SeatControlData class
+	 *
+	 * @param massageMode
+	 */
+	public void setMassageMode(List<MassageModeData> massageMode) {
+		setValue(KEY_MASSAGE_MODE, massageMode);
+	}
+
+	/**
+	 * Gets the List<MassageCushionFirmness> portion of the SeatControlData class
+	 *
+	 * @return List<MassageCushionFirmness>.
+	 */
+	@SuppressWarnings("unchecked")
+	public List<MassageCushionFirmness> getMassageCushionFirmness() {
+		return (List<MassageCushionFirmness>) getObject(MassageCushionFirmness.class, KEY_MASSAGE_CUSHION_FIRMNESS);
+	}
+
+	/**
+	 * Sets the massageCushionFirmness portion of the SeatControlData class
+	 *
+	 * @param massageCushionFirmness
+	 */
+	public void setMassageCushionFirmness(List<MassageCushionFirmness> massageCushionFirmness) {
+		setValue(KEY_MASSAGE_CUSHION_FIRMNESS, massageCushionFirmness);
+	}
+
+	/**
+	 * Sets the memory portion of the SeatControlData class
+	 *
+	 * @param memory
+	 */
+	public void setMemory(SeatMemoryAction memory) {
+		setValue(KEY_MEMORY, memory);
+	}
+
+	/**
+	 * Gets the memory portion of the SeatControlData class
+	 *
+	 * @return SeatMemoryAction.
+	 */
+	@SuppressWarnings("unchecked")
+	public SeatMemoryAction getMemory() {
+		return (SeatMemoryAction) getObject(SeatMemoryAction.class, KEY_MEMORY);
+	}
+}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SeatMemoryAction.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SeatMemoryAction.java
new file mode 100644
index 000000000..a8673a9eb
--- /dev/null
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SeatMemoryAction.java
@@ -0,0 +1,95 @@
+package com.smartdevicelink.proxy.rpc;
+
+import android.support.annotation.NonNull;
+
+import com.smartdevicelink.proxy.RPCStruct;
+import com.smartdevicelink.proxy.rpc.enums.SeatMemoryActionType;
+
+import java.util.Hashtable;
+
+public class SeatMemoryAction extends RPCStruct {
+	public static final String KEY_ID = "id";
+	public static final String KEY_LABEL = "label";
+	public static final String KEY_ACTION = "action";
+
+	/**
+	 * Constructs a new SeatMemoryAction object
+	 */
+	public SeatMemoryAction() {
+	}
+
+	/**
+	 * <p>Constructs a new SeatMemoryAction object indicated by the Hashtable parameter
+	 * </p>
+	 *
+	 * @param hash The Hashtable to use
+	 */
+	public SeatMemoryAction(Hashtable<String, Object> hash) {
+		super(hash);
+	}
+
+	/**
+	 * Constructs a newly allocated SeatMemoryAction object
+	 * @param id     Min: 0  Max: 10
+	 * @param action type of SeatMemoryActionType.
+	 */
+	public SeatMemoryAction(@NonNull Integer id, @NonNull SeatMemoryActionType action) {
+		this();
+		setId(id);
+		setAction(action);
+	}
+
+	/**
+	 * Sets the id portion of the SeatMemoryAction class
+	 *
+	 * @param id
+	 */
+	public void setId(@NonNull Integer id) {
+		setValue(KEY_ID, id);
+	}
+
+	/**
+	 * Gets the id portion of the SeatMemoryAction class
+	 *
+	 * @return Integer
+	 */
+	public Integer getId() {
+		return getInteger(KEY_ID);
+	}
+
+	/**
+	 * Sets the label portion of the SeatMemoryAction class
+	 *
+	 * @param label
+	 */
+	public void setLabel(String label) {
+		setValue(KEY_LABEL, label);
+	}
+
+	/**
+	 * Gets the label portion of the SeatMemoryAction class
+	 *
+	 * @return String
+	 */
+	public String getLabel() {
+		return getString(KEY_LABEL);
+	}
+
+	/**
+	 * Sets the action portion of the SeatMemoryAction class
+	 *
+	 * @param action
+	 */
+	public void setAction(@NonNull SeatMemoryActionType action) {
+		setValue(KEY_ACTION, action);
+	}
+
+	/**
+	 * Gets the action portion of the SeatMemoryAction class
+	 *
+	 * @return SeatMemoryActionType.
+	 */
+	public SeatMemoryActionType getAction() {
+		return (SeatMemoryActionType) getObject(SeatMemoryActionType.class, KEY_ACTION);
+	}
+}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetMediaClockTimer.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetMediaClockTimer.java
index 4ec73b9d7..fb15e3242 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetMediaClockTimer.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SetMediaClockTimer.java
@@ -4,6 +4,7 @@ import android.support.annotation.NonNull;
 

 import com.smartdevicelink.protocol.enums.FunctionID;

 import com.smartdevicelink.proxy.RPCRequest;

+import com.smartdevicelink.proxy.rpc.enums.AudioStreamingIndicator;

 import com.smartdevicelink.proxy.rpc.enums.UpdateMode;

 

 import java.util.Hashtable;

@@ -54,6 +55,13 @@ import java.util.Hashtable;
  * 			<td>SmartDeviceLink 1.0</td>

  * 		</tr>

  * 		<tr>

+ * 			<td>audioStreamingIndicator</td>

+ * 			<td>AudioStreamingIndicator</td>

+ * 			<td></td>

+ *                 <td>N</td>

+ * 			<td></td>

+ * 			<td>SmartDeviceLink 4.6</td>

+ * 		</tr>

  *

  *  </table>

  *  

@@ -76,6 +84,7 @@ public class SetMediaClockTimer extends RPCRequest {
 	public static final String KEY_START_TIME = "startTime";

 	public static final String KEY_END_TIME = "endTime";

 	public static final String KEY_UPDATE_MODE = "updateMode";

+	public static final String KEY_AUDIO_STREAMING_INDICATOR = "audioStreamingIndicator";

 	/**

 	 * Constructs a new SetMediaClockTimer object

 	 */

@@ -168,4 +177,20 @@ public class SetMediaClockTimer extends RPCRequest {
     public void setUpdateMode( @NonNull UpdateMode updateMode ) {

 		setParameters(KEY_UPDATE_MODE, updateMode);

     }

+

+	/**

+	 * Gets the playback status of a media app

+	 *

+	 * @return AudioStreamingIndicator - a Enumeration value

+	 */

+	public AudioStreamingIndicator getAudioStreamingIndicator() {

+		return (AudioStreamingIndicator) getObject(AudioStreamingIndicator.class, KEY_AUDIO_STREAMING_INDICATOR);

+	}

+

+	/**

+	 * Sets the playback status of a media app

+	 */

+	public void setAudioStreamingIndicator(AudioStreamingIndicator audioStreamingIndicator ) {

+		setParameters(KEY_AUDIO_STREAMING_INDICATOR, audioStreamingIndicator);

+	}

 }

diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleData.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleData.java
index 036af0447..a7290aad9 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleData.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleData.java
@@ -281,6 +281,7 @@ public class SubscribeVehicleData extends RPCRequest {
 	public static final String KEY_SPEED = "speed";

 	public static final String KEY_FUEL_RANGE = "fuelRange";

 	public static final String KEY_TURN_SIGNAL = "turnSignal";

+	public static final String KEY_ELECTRONIC_PARK_BRAKE_STATUS = "electronicParkBrakeStatus";

 

 	/**

 	 * Constructs a new SubscribeVehicleData object

@@ -785,9 +786,26 @@ public class SubscribeVehicleData extends RPCRequest {
 	 * @param turnSignal a boolean value

 	 */

 	public void setTurnSignal(Boolean turnSignal) { setParameters(KEY_TURN_SIGNAL, turnSignal); }

+

 	/**

 	 * Gets a boolean value. If true, means the turnSignal data has been subscribed.

 	 * @return a Boolean value.

 	 */

 	public Boolean getTurnSignal() { return getBoolean(KEY_TURN_SIGNAL); }

+

+	/**

+	 * Sets a boolean value. If true, subscribes electronicParkBrakeStatus data

+	 * @param electronicParkBrakeStatus a boolean value

+	 */

+	public void setElectronicParkBrakeStatus(boolean electronicParkBrakeStatus){

+		setParameters(KEY_ELECTRONIC_PARK_BRAKE_STATUS, electronicParkBrakeStatus);

+	}

+

+	/**

+	 * Gets a boolean value. If true, means the electronicParkBrakeStatus data has been subscribed.

+	 * @return a Boolean value.

+	 */

+	public Boolean getElectronicParkBrakeStatus(){

+		return getBoolean(KEY_ELECTRONIC_PARK_BRAKE_STATUS);

+	}

 }

diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleDataResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleDataResponse.java
index 5855f02b4..47d32936d 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleDataResponse.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleDataResponse.java
@@ -41,6 +41,7 @@ public class SubscribeVehicleDataResponse extends RPCResponse {
 	public static final String KEY_MY_KEY = "myKey";

 	public static final String KEY_FUEL_RANGE = "fuelRange";

 	public static final String KEY_TURN_SIGNAL = "turnSignal";

+	public static final String KEY_ELECTRONIC_PARK_BRAKE_STATUS = "electronicParkBrakeStatus";

 

 	/**

 	 * Constructs a new SubscribeVehicleDataResponse object

@@ -449,4 +450,20 @@ public class SubscribeVehicleDataResponse extends RPCResponse {
     public VehicleDataResult getTurnSignal() {

         return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_TURN_SIGNAL);

     }

+

+    /**

+     * Sets electronicParkBrakeStatus

+     * @param electronicParkBrakeStatus

+     */

+    public void setElectronicParkBrakeStatus(VehicleDataResult electronicParkBrakeStatus){

+        setParameters(KEY_ELECTRONIC_PARK_BRAKE_STATUS, electronicParkBrakeStatus);

+    }

+

+    /**

+     * Gets electronicParkBrakeStatus

+     * @return VehicleDataResult

+     */

+    public VehicleDataResult getElectronicParkBrakeStatus(){

+        return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_ELECTRONIC_PARK_BRAKE_STATUS);

+    }

 }

diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleData.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleData.java
index 1f57de8f2..d8dfa702a 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleData.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleData.java
@@ -274,6 +274,7 @@ public class UnsubscribeVehicleData extends RPCRequest {
 	public static final String KEY_MY_KEY = "myKey";

 	public static final String KEY_FUEL_RANGE = "fuelRange";

 	public static final String KEY_TURN_SIGNAL = "turnSignal";

+	public static final String KEY_ELECTRONIC_PARK_BRAKE_STATUS = "electronicParkBrakeStatus";

 

 	/**

 	 * Constructs a new UnsubscribeVehicleData object

@@ -779,9 +780,26 @@ public class UnsubscribeVehicleData extends RPCRequest {
 	 * @param turnSignal a boolean value

 	 */

 	public void setTurnSignal(Boolean turnSignal) { setParameters(KEY_TURN_SIGNAL, turnSignal); }

+

 	/**

 	 * Gets a boolean value. If true, means the turnSignal data has been subscribed.

 	 * @return a Boolean value.

 	 */

 	public Boolean getTurnSignal() { return getBoolean(KEY_TURN_SIGNAL); }

+

+	/**

+	 * Sets a boolean value. If true, subscribes electronicParkBrakeStatus data

+	 * @param electronicParkBrakeStatus a boolean value

+	 */

+	public void setElectronicParkBrakeStatus(Boolean electronicParkBrakeStatus) {

+		setParameters(KEY_ELECTRONIC_PARK_BRAKE_STATUS, electronicParkBrakeStatus);

+	}

+

+	/**

+	 * Gets a boolean value. If true, means the electronicParkBrakeStatus data has been subscribed.

+	 * @return a Boolean value.

+	 */

+	public Boolean getElectronicParkBrakeStatus() {

+		return getBoolean(KEY_ELECTRONIC_PARK_BRAKE_STATUS);

+	}

 }

diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleDataResponse.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleDataResponse.java
index 345c0d25b..0ed8aac33 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleDataResponse.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleDataResponse.java
@@ -44,6 +44,7 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse {
 	public static final String KEY_MY_KEY = "myKey";

 	public static final String KEY_FUEL_RANGE = "fuelRange";

 	public static final String KEY_TURN_SIGNAL = "turnSignal";

+	public static final String KEY_ELECTRONIC_PARK_BRAKE_STATUS = "electronicParkBrakeStatus";

 

 	/**

 	 * Constructs a new UnsubscribeVehicleDataResponse object

@@ -454,4 +455,20 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse {
     public VehicleDataResult getTurnSignal() {

         return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_TURN_SIGNAL);

     }

+

+    /**

+     * Sets electronicParkBrakeStatus

+     * @param electronicParkBrakeStatus

+     */

+    public void setElectronicParkBrakeStatus(VehicleDataResult electronicParkBrakeStatus){

+        setParameters(KEY_ELECTRONIC_PARK_BRAKE_STATUS, electronicParkBrakeStatus);

+    }

+

+    /**

+     * Gets electronicParkBrakeStatus

+     * @return VehicleDataResult

+     */

+    public VehicleDataResult getElectronicParkBrakeStatus(){

+        return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_ELECTRONIC_PARK_BRAKE_STATUS);

+    }

 }

diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AudioStreamingIndicator.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AudioStreamingIndicator.java
new file mode 100644
index 000000000..1792de469
--- /dev/null
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/AudioStreamingIndicator.java
@@ -0,0 +1,48 @@
+package com.smartdevicelink.proxy.rpc.enums;
+
+/**
+ * Identifies the playback status of a media app
+ *
+ * @since SmartDeviceLink 4.6
+ */
+public enum AudioStreamingIndicator {
+	/**
+	 * Default playback indicator.
+	 *
+	 * @since SmartDeviceLink 4.6
+	 */
+	PLAY_PAUSE,
+
+	/**
+	 * Indicates that a button press of the Play/Pause button would start the playback.
+	 *
+	 * @since SmartDeviceLink 4.6
+	 */
+	PLAY,
+	/**
+	 * Indicates that a button press of the Play/Pause button would pause the current playback.
+	 *
+	 * @since SmartDeviceLink 4.6
+	 */
+	PAUSE,
+	/**
+	 * Indicates that a button press of the Play/Pause button would stop the current playback.
+	 *
+	 * @since SmartDeviceLink 4.6
+	 */
+	STOP,
+	;
+
+	/**
+	 * Convert String to AudioStreamingIndicator
+	 * @param value String
+	 * @return AudioStreamingIndicator
+	 */
+	public static AudioStreamingIndicator valueForString(String value) {
+		try{
+			return valueOf(value);
+		}catch(Exception e){
+			return null;
+		}
+	}
+}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ElectronicParkBrakeStatus.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ElectronicParkBrakeStatus.java
new file mode 100644
index 000000000..f3951c7a1
--- /dev/null
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ElectronicParkBrakeStatus.java
@@ -0,0 +1,38 @@
+package com.smartdevicelink.proxy.rpc.enums;
+
+public enum ElectronicParkBrakeStatus {
+	/**
+	 * Park brake actuators have been fully applied.
+	 */
+	CLOSED,
+	/**
+	 * Park brake actuators are transitioning to either Apply/Closed or Release/Open state.
+	 */
+	TRANSITION,
+	/**
+	 *  Park brake actuators are released.
+	 */
+	OPEN,
+	/**
+	 * When driver pulls the Electronic Park Brake switch while driving "at speed".
+	 */
+	DRIVE_ACTIVE,
+	/**
+	 * When system has a fault or is under maintenance.
+	 */
+	FAULT,
+	;
+
+	/**
+	 * Convert String to ElectronicParkBrakeStatus
+	 * @param value String
+	 * @return ElectronicParkBrakeStatus
+	 */
+	public static ElectronicParkBrakeStatus valueForString(String value) {
+		try{
+			return valueOf(value);
+		}catch(Exception e){
+			return null;
+		}
+	}
+}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/MassageCushion.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/MassageCushion.java
new file mode 100644
index 000000000..ed23b4899
--- /dev/null
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/MassageCushion.java
@@ -0,0 +1,21 @@
+package com.smartdevicelink.proxy.rpc.enums;
+
+/**
+ * List possible cushions of a multi-contour massage seat.
+ */
+public enum MassageCushion {
+	TOP_LUMBAR,
+	MIDDLE_LUMBAR,
+	BOTTOM_LUMBAR,
+	BACK_BOLSTERS,
+	SEAT_BOLSTERS,
+	;
+
+	public static MassageCushion valueForString(String value) {
+		try {
+			return valueOf(value);
+		} catch (Exception e) {
+			return null;
+		}
+	}
+}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/MassageMode.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/MassageMode.java
new file mode 100644
index 000000000..59a200bdb
--- /dev/null
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/MassageMode.java
@@ -0,0 +1,19 @@
+package com.smartdevicelink.proxy.rpc.enums;
+
+/**
+ * List possible modes of a massage zone.
+ */
+public enum MassageMode {
+	OFF,
+	LOW,
+	HIGH,
+	;
+
+	public static MassageMode valueForString(String value) {
+		try {
+			return valueOf(value);
+		} catch (Exception e) {
+			return null;
+		}
+	}
+}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/MassageZone.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/MassageZone.java
new file mode 100644
index 000000000..9f0e23ffe
--- /dev/null
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/MassageZone.java
@@ -0,0 +1,24 @@
+package com.smartdevicelink.proxy.rpc.enums;
+
+/**
+ * List possible zones of a multi-contour massage seat.
+ */
+public enum MassageZone {
+	/**
+	 * The back of a multi-contour massage seat. or SEAT_BACK
+	 */
+	LUMBAR,
+	/**
+	 * The bottom a multi-contour massage seat. or SEAT_BOTTOM
+	 */
+	SEAT_CUSHION,
+	;
+
+	public static MassageZone valueForString(String value) {
+		try {
+			return valueOf(value);
+		} catch (Exception e) {
+			return null;
+		}
+	}
+}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ModuleType.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ModuleType.java
index faef92d36..5eaf6366e 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ModuleType.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/ModuleType.java
@@ -1,15 +1,16 @@
 package com.smartdevicelink.proxy.rpc.enums;
 
 public enum ModuleType {
-    CLIMATE,
-    RADIO,
-    ;
+	CLIMATE,
+	RADIO,
+	SEAT,
+	;
 
-    public static ModuleType valueForString(String value) {
-        try{
-            return valueOf(value);
-        }catch(Exception e){
-            return null;
-        }
-    }
+	public static ModuleType valueForString(String value) {
+		try {
+			return valueOf(value);
+		} catch (Exception e) {
+			return null;
+		}
+	}
 }
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SeatMemoryActionType.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SeatMemoryActionType.java
new file mode 100644
index 000000000..e81b2694a
--- /dev/null
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SeatMemoryActionType.java
@@ -0,0 +1,25 @@
+package com.smartdevicelink.proxy.rpc.enums;
+
+public enum SeatMemoryActionType {
+	/**
+	 * Save current seat positions and settings to seat memory.
+	 */
+	SAVE,
+	/**
+	 * Restore / apply the seat memory settings to the current seat.
+	 */
+	RESTORE,
+	/**
+	 * No action to be performed.
+	 */
+	NONE,
+	;
+
+	public static SeatMemoryActionType valueForString(String value) {
+		try {
+			return valueOf(value);
+		} catch (Exception e) {
+			return null;
+		}
+	}
+}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SupportedSeat.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SupportedSeat.java
new file mode 100644
index 000000000..c68f2e79d
--- /dev/null
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/SupportedSeat.java
@@ -0,0 +1,18 @@
+package com.smartdevicelink.proxy.rpc.enums;
+
+/**
+ * List possible seats that is a remote controllable seat.
+ */
+public enum SupportedSeat {
+	DRIVER,
+	FRONT_PASSENGER,
+	;
+
+	public static SupportedSeat valueForString(String value) {
+		try {
+			return valueOf(value);
+		} catch (Exception e) {
+			return null;
+		}
+	}
+}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataType.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataType.java
index 7989edecd..01525ef4a 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataType.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataType.java
@@ -120,6 +120,11 @@ public enum VehicleDataType {
      * Notifies TURNSIGNALData may be subscribed

      */

     VEHICLEDATA_TURNSIGNAL,

+

+    /**

+     * Notifies ELECTRONICPARKBRAKESTATUSData may be subscribed

+     */

+    VEHICLEDATA_ELECTRONICPARKBRAKESTATUS,

     ;

 

      /**

diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCListener.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCListener.java
new file mode 100644
index 000000000..8de606b7c
--- /dev/null
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCListener.java
@@ -0,0 +1,55 @@
+package com.smartdevicelink.proxy.rpc.listeners;
+
+import com.smartdevicelink.proxy.RPCMessage;
+
+public abstract class OnRPCListener {
+
+    /**
+     * Generic listener for all RPCs including Requests, response, and notificaiton
+     */
+    public final static int UPDATE_LISTENER_TYPE_ALL_RPCS		= -1;
+
+    /**
+     * Generic listener type that will work for most RPCs
+     */
+    public final static int UPDATE_LISTENER_TYPE_BASE_RPC 		= 0;
+    /**
+     * Listener type specific to putfile
+     */
+    public final static int UPDATE_LISTENER_TYPE_PUT_FILE 		= 1;
+    /**
+     * Listener type specific to sendRequests and sendSequentialRequests
+     */
+    public final static int UPDATE_LISTENER_TYPE_MULTIPLE_REQUESTS 		= 2;
+
+    /**
+     * Stores what type of listener this instance is. This prevents of from having to use reflection
+     */
+    int listenerType;
+
+    /**
+     * This is the base listener for all RPCs.
+     */
+    public OnRPCListener(){
+        setListenerType(UPDATE_LISTENER_TYPE_ALL_RPCS);
+    }
+
+    protected final void setListenerType(int type){
+        this.listenerType = type;
+    }
+    /**
+     * This is used to see what type of listener this instance is. It is needed
+     * because some RPCs require additional callbacks. Types are  constants located in this class
+     * @return the type of listener this is
+     */
+    public int getListenerType(){
+        return this.listenerType;
+    }
+
+    /**
+     * This is the only method that must be extended.
+     * @param message This will be the response message received from the core side. It should be cast into a corresponding RPC Response type. ie, if setting this
+     * for a PutFile request, the message parameter should be cast to a PutFileResponse class.
+     */
+    public abstract void onReceived(final RPCMessage message);
+}
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCResponseListener.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCResponseListener.java
index c21244926..2c40fe0df 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCResponseListener.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCResponseListener.java
@@ -1,77 +1,53 @@
-package com.smartdevicelink.proxy.rpc.listeners;
-
-import com.smartdevicelink.proxy.RPCResponse;
-import com.smartdevicelink.proxy.rpc.enums.Result;
-
-public abstract class OnRPCResponseListener {
-	/**
-	 * Generic listener type that will work for most RPCs
-	 */
-	public final static int UPDATE_LISTENER_TYPE_BASE_RPC 		= 0;
-	/**
-	 * Listener type specific to putfile
-	 */
-	public final static int UPDATE_LISTENER_TYPE_PUT_FILE 		= 1;
-	/**
-	 * Listener type specific to sendRequests and sendSequentialRequests
-	 */
-	public final static int UPDATE_LISTENER_TYPE_MULTIPLE_REQUESTS 		= 2;
-
-	/**
-	 * Stores what type of listener this instance is. This prevents of from having to use reflection
-	 */
-	int listenerType;
-	
-	/**
-	 * This is the base listener for all RPCs.
-	 */
-	public OnRPCResponseListener(){
-		setListenerType(UPDATE_LISTENER_TYPE_BASE_RPC);
-	}
-	
-	protected final void setListenerType(int type){
-		this.listenerType = type;
-	}
-	/**
-	 * This is used to see what type of listener this instance is. It is needed
-	 * because some RPCs require additional callbacks. Types are  constants located in this class
-	 * @return the type of listener this is 
-	 */
-	public int getListenerType(){
-		return this.listenerType;
-	}
-	
-	/* *****************************************************************
-	 ************************* Event Callbacks *************************
-	 *******************************************************************/
-	
-	/**
-	 * This method will be called once the packet has been entered into the queue of messages to send
-	 * @param correlationId
-	 */
-	public void onStart(int correlationId){
-		
-	};
-
-	/**
-	 * This is the only method that must be extended. Other methods that are able to be extended are 
-	 * onStart and onError.
-	 * @param correlationId
-	 * @param response This will be the response message received from the core side. It should be cast into a corresponding RPC Response type. ie, if setting this
-	 * for a PutFile request, the message parameter should be cast to a PutFileResponse class.
-	 */
-	public abstract void onResponse(int correlationId, final RPCResponse response);
-	
-	/**
-	 * Called when there was some sort of error during the original request.
-	 * @param correlationId
-	 * @param resultCode
-	 * @param info
-	 */
-	public void onError(int correlationId, Result resultCode, String info){
-		
-	};
-	
-
-	
-}
+package com.smartdevicelink.proxy.rpc.listeners;

+

+import com.smartdevicelink.proxy.RPCMessage;

+import com.smartdevicelink.proxy.RPCResponse;

+import com.smartdevicelink.proxy.rpc.enums.Result;

+

+public abstract class OnRPCResponseListener extends OnRPCListener {

+

+

+	public OnRPCResponseListener(){

+		setListenerType(OnRPCListener.UPDATE_LISTENER_TYPE_BASE_RPC);

+	}

+

+	public final void onReceived(final RPCMessage message){

+		if (message != null && message instanceof RPCResponse){

+			onResponse(((RPCResponse) message).getCorrelationID(), (RPCResponse)message);

+		}

+	}

+

+	/* *****************************************************************

+	 ************************* Event Callbacks *************************

+	 *******************************************************************/

+	

+	/**

+	 * This method will be called once the packet has been entered into the queue of messages to send

+	 * @param correlationId

+	 */

+	public void onStart(int correlationId){

+		

+	};

+

+	/**

+	 * This is the only method that must be extended. Other methods that are able to be extended are 

+	 * onStart and onError.

+	 * @param correlationId

+	 * @param response This will be the response message received from the core side. It should be cast into a corresponding RPC Response type. ie, if setting this

+	 * for a PutFile request, the message parameter should be cast to a PutFileResponse class.

+	 */

+	public abstract void onResponse(int correlationId, final RPCResponse response);

+	

+	/**

+	 * Called when there was some sort of error during the original request.

+	 * @param correlationId

+	 * @param resultCode

+	 * @param info

+	 */

+	public void onError(int correlationId, Result resultCode, String info){

+		

+	};

+	

+

+	

+}