From 628ad431c3e335b0af85dd87d00c844a8378ba91 Mon Sep 17 00:00:00 2001
From: Shobhit Adlakha <adlakhashobhit@gmail.com>
Date: Wed, 25 Sep 2019 17:22:45 -0400
Subject: [PATCH 1/2] Set mandatory=false for all response params(other than
 resultCode and success) in the MOBILE_API

---
 src/components/interfaces/MOBILE_API.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/interfaces/MOBILE_API.xml b/src/components/interfaces/MOBILE_API.xml
index 2307dada032..dd8cefe71a8 100644
--- a/src/components/interfaces/MOBILE_API.xml
+++ b/src/components/interfaces/MOBILE_API.xml
@@ -6529,7 +6529,7 @@
             <description>Provides additional human readable info regarding the result.</description>
         </param>
         
-        <param name="ecuHeader" type="Integer" minvalue="0" maxvalue="65535" mandatory="true">
+        <param name="ecuHeader" type="Integer" minvalue="0" maxvalue="65535" mandatory="false">
             <description>2 byte ECU Header for DTC response (as defined in VHR_Layout_Specification_DTCs.pdf)</description>
         </param>
         
@@ -6584,7 +6584,7 @@
             <description>Provides additional human readable info regarding the result.</description>
         </param>
         
-        <param name="messageDataResult" type="Integer" minvalue="0" maxvalue="255" minsize="1" maxsize="65535" array="true" mandatory="true">
+        <param name="messageDataResult" type="Integer" minvalue="0" maxvalue="255" minsize="1" maxsize="65535" array="true" mandatory="false">
             <description>
                 Array of bytes comprising CAN message result.
             </description>
@@ -7438,7 +7438,7 @@
     </function>
     
     <function name="GetInteriorVehicleData" functionID="GetInteriorVehicleDataID" messagetype="response" since="4.5">
-        <param name="moduleData" type="ModuleData" mandatory="true">
+        <param name="moduleData" type="ModuleData" mandatory="false">
         </param>
         <param name="resultCode" type="Result" platform="documentation" mandatory="true">
             <description>See Result</description>
@@ -7540,7 +7540,7 @@
     
     <function name="SetInteriorVehicleData" functionID="SetInteriorVehicleDataID" messagetype="response" since="4.5">
         <description>Used to set the values of one remote control module </description>
-        <param name="moduleData" type="ModuleData" mandatory="true">
+        <param name="moduleData" type="ModuleData" mandatory="false">
         </param>
         <param name="resultCode" type="Result" platform="documentation" mandatory="true">
             <description>See Result</description>
@@ -7656,7 +7656,7 @@
     </function>
     
     <function name="GetSystemCapability" functionID="GetSystemCapabilityID" messagetype="response" since="4.5">
-        <param name="systemCapability" type="SystemCapability" mandatory="true">
+        <param name="systemCapability" type="SystemCapability" mandatory="false">
         </param>
         <param name="resultCode" type="Result" platform="documentation" mandatory="true">
             <description>See Result</description>

From 5698f443c02d17b0f534794b20e6040684f699ba Mon Sep 17 00:00:00 2001
From: Shobhit Adlakha <adlakhashobhit@gmail.com>
Date: Thu, 26 Sep 2019 11:40:20 -0400
Subject: [PATCH 2/2] Add moduleData key check in
 RCHelpers::RemoveRedundantGPSDataFromIVDataMsg

---
 .../rpc_plugins/rc_rpc_plugin/src/rc_helpers.cc                | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_helpers.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_helpers.cc
index 8cf20948cf9..ca0edc90b1d 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_helpers.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_helpers.cc
@@ -257,6 +257,9 @@ void RCHelpers::RemoveRedundantGPSDataFromIVDataMsg(
   using namespace application_manager::strings;
 
   LOG4CXX_AUTO_TRACE(logger_);
+  if (!msg_params.keyExists(kModuleData)) {
+    return;
+  }
   auto& module_data = msg_params[kModuleData];
   if (!module_data.keyExists(kRadioControlData) ||
       !module_data[kRadioControlData].keyExists(kSisData) ||