diff --git a/audio/4.0/config/api/current.txt b/audio/4.0/config/api/current.txt
index f0814bf..d59cade 100644
--- a/audio/4.0/config/api/current.txt
+++ b/audio/4.0/config/api/current.txt
@@ -1,3 +1,4 @@
+// Signature format: 2.0
 package audio.policy.configuration.V4_0 {
 
   public class AttachedDevices {
@@ -5,10 +6,8 @@
     method public java.util.List<java.lang.String> getItem();
   }
 
-  public final class AudioDevice extends java.lang.Enum {
-    method public java.lang.String getRawName();
-    method public static audio.policy.configuration.V4_0.AudioDevice valueOf(java.lang.String);
-    method public static final audio.policy.configuration.V4_0.AudioDevice[] values();
+  public enum AudioDevice {
+    method public String getRawName();
     enum_constant public static final audio.policy.configuration.V4_0.AudioDevice AUDIO_DEVICE_IN_AMBIENT;
     enum_constant public static final audio.policy.configuration.V4_0.AudioDevice AUDIO_DEVICE_IN_ANLG_DOCK_HEADSET;
     enum_constant public static final audio.policy.configuration.V4_0.AudioDevice AUDIO_DEVICE_IN_AUX_DIGITAL;
@@ -72,10 +71,8 @@
     enum_constant public static final audio.policy.configuration.V4_0.AudioDevice AUDIO_DEVICE_OUT_WIRED_HEADSET;
   }
 
-  public final class AudioFormat extends java.lang.Enum {
-    method public java.lang.String getRawName();
-    method public static audio.policy.configuration.V4_0.AudioFormat valueOf(java.lang.String);
-    method public static final audio.policy.configuration.V4_0.AudioFormat[] values();
+  public enum AudioFormat {
+    method public String getRawName();
     enum_constant public static final audio.policy.configuration.V4_0.AudioFormat AUDIO_FORMAT_AAC;
     enum_constant public static final audio.policy.configuration.V4_0.AudioFormat AUDIO_FORMAT_AAC_ADIF;
     enum_constant public static final audio.policy.configuration.V4_0.AudioFormat AUDIO_FORMAT_AAC_ADTS;
@@ -148,10 +145,8 @@
     method public void setVersion(audio.policy.configuration.V4_0.Version);
   }
 
-  public final class AudioUsage extends java.lang.Enum {
-    method public java.lang.String getRawName();
-    method public static audio.policy.configuration.V4_0.AudioUsage valueOf(java.lang.String);
-    method public static final audio.policy.configuration.V4_0.AudioUsage[] values();
+  public enum AudioUsage {
+    method public String getRawName();
     enum_constant public static final audio.policy.configuration.V4_0.AudioUsage AUDIO_USAGE_ALARM;
     enum_constant public static final audio.policy.configuration.V4_0.AudioUsage AUDIO_USAGE_ASSISTANCE_ACCESSIBILITY;
     enum_constant public static final audio.policy.configuration.V4_0.AudioUsage AUDIO_USAGE_ASSISTANCE_NAVIGATION_GUIDANCE;
@@ -167,10 +162,8 @@
     enum_constant public static final audio.policy.configuration.V4_0.AudioUsage AUDIO_USAGE_VOICE_COMMUNICATION_SIGNALLING;
   }
 
-  public final class DeviceCategory extends java.lang.Enum {
-    method public java.lang.String getRawName();
-    method public static audio.policy.configuration.V4_0.DeviceCategory valueOf(java.lang.String);
-    method public static final audio.policy.configuration.V4_0.DeviceCategory[] values();
+  public enum DeviceCategory {
+    method public String getRawName();
     enum_constant public static final audio.policy.configuration.V4_0.DeviceCategory DEVICE_CATEGORY_EARPIECE;
     enum_constant public static final audio.policy.configuration.V4_0.DeviceCategory DEVICE_CATEGORY_EXT_MEDIA;
     enum_constant public static final audio.policy.configuration.V4_0.DeviceCategory DEVICE_CATEGORY_HEADSET;
@@ -185,25 +178,23 @@
 
   public static class DevicePorts.DevicePort {
     ctor public DevicePorts.DevicePort();
-    method public java.lang.String getAddress();
+    method public String getAddress();
     method public audio.policy.configuration.V4_0.Gains getGains();
     method public java.util.List<audio.policy.configuration.V4_0.Profile> getProfile();
     method public audio.policy.configuration.V4_0.Role getRole();
-    method public java.lang.String getTagName();
-    method public java.lang.String getType();
+    method public String getTagName();
+    method public String getType();
     method public boolean get_default();
-    method public void setAddress(java.lang.String);
+    method public void setAddress(String);
     method public void setGains(audio.policy.configuration.V4_0.Gains);
     method public void setRole(audio.policy.configuration.V4_0.Role);
-    method public void setTagName(java.lang.String);
-    method public void setType(java.lang.String);
+    method public void setTagName(String);
+    method public void setType(String);
     method public void set_default(boolean);
   }
 
-  public final class GainMode extends java.lang.Enum {
-    method public java.lang.String getRawName();
-    method public static audio.policy.configuration.V4_0.GainMode valueOf(java.lang.String);
-    method public static final audio.policy.configuration.V4_0.GainMode[] values();
+  public enum GainMode {
+    method public String getRawName();
     enum_constant public static final audio.policy.configuration.V4_0.GainMode AUDIO_GAIN_MODE_CHANNELS;
     enum_constant public static final audio.policy.configuration.V4_0.GainMode AUDIO_GAIN_MODE_JOINT;
     enum_constant public static final audio.policy.configuration.V4_0.GainMode AUDIO_GAIN_MODE_RAMP;
@@ -216,23 +207,23 @@
 
   public static class Gains.Gain {
     ctor public Gains.Gain();
-    method public java.lang.String getChannel_mask();
+    method public String getChannel_mask();
     method public int getDefaultValueMB();
     method public int getMaxRampMs();
     method public int getMaxValueMB();
     method public int getMinRampMs();
     method public int getMinValueMB();
     method public audio.policy.configuration.V4_0.GainMode getMode();
-    method public java.lang.String getName();
+    method public String getName();
     method public int getStepValueMB();
-    method public void setChannel_mask(java.lang.String);
+    method public void setChannel_mask(String);
     method public void setDefaultValueMB(int);
     method public void setMaxRampMs(int);
     method public void setMaxValueMB(int);
     method public void setMinRampMs(int);
     method public void setMinValueMB(int);
     method public void setMode(audio.policy.configuration.V4_0.GainMode);
-    method public void setName(java.lang.String);
+    method public void setName(String);
     method public void setStepValueMB(int);
   }
 
@@ -242,10 +233,8 @@
     method public void setSpeaker_drc_enabled(boolean);
   }
 
-  public final class HalVersion extends java.lang.Enum {
-    method public java.lang.String getRawName();
-    method public static audio.policy.configuration.V4_0.HalVersion valueOf(java.lang.String);
-    method public static final audio.policy.configuration.V4_0.HalVersion[] values();
+  public enum HalVersion {
+    method public String getRawName();
     enum_constant public static final audio.policy.configuration.V4_0.HalVersion _2_0;
     enum_constant public static final audio.policy.configuration.V4_0.HalVersion _3_0;
   }
@@ -257,27 +246,25 @@
 
   public static class MixPorts.MixPort {
     ctor public MixPorts.MixPort();
-    method public java.lang.String getFlags();
+    method public String getFlags();
     method public audio.policy.configuration.V4_0.Gains getGains();
     method public long getMaxActiveCount();
     method public long getMaxOpenCount();
-    method public java.lang.String getName();
+    method public String getName();
     method public java.util.List<audio.policy.configuration.V4_0.AudioUsage> getPreferredUsage();
     method public java.util.List<audio.policy.configuration.V4_0.Profile> getProfile();
     method public audio.policy.configuration.V4_0.Role getRole();
-    method public void setFlags(java.lang.String);
+    method public void setFlags(String);
     method public void setGains(audio.policy.configuration.V4_0.Gains);
     method public void setMaxActiveCount(long);
     method public void setMaxOpenCount(long);
-    method public void setName(java.lang.String);
+    method public void setName(String);
     method public void setPreferredUsage(java.util.List<audio.policy.configuration.V4_0.AudioUsage>);
     method public void setRole(audio.policy.configuration.V4_0.Role);
   }
 
-  public final class MixType extends java.lang.Enum {
-    method public java.lang.String getRawName();
-    method public static audio.policy.configuration.V4_0.MixType valueOf(java.lang.String);
-    method public static final audio.policy.configuration.V4_0.MixType[] values();
+  public enum MixType {
+    method public String getRawName();
     enum_constant public static final audio.policy.configuration.V4_0.MixType mix;
     enum_constant public static final audio.policy.configuration.V4_0.MixType mux;
   }
@@ -290,44 +277,42 @@
   public static class Modules.Module {
     ctor public Modules.Module();
     method public audio.policy.configuration.V4_0.AttachedDevices getAttachedDevices();
-    method public java.lang.String getDefaultOutputDevice();
+    method public String getDefaultOutputDevice();
     method public audio.policy.configuration.V4_0.DevicePorts getDevicePorts();
     method public audio.policy.configuration.V4_0.HalVersion getHalVersion();
     method public audio.policy.configuration.V4_0.MixPorts getMixPorts();
-    method public java.lang.String getName();
+    method public String getName();
     method public audio.policy.configuration.V4_0.Routes getRoutes();
     method public void setAttachedDevices(audio.policy.configuration.V4_0.AttachedDevices);
-    method public void setDefaultOutputDevice(java.lang.String);
+    method public void setDefaultOutputDevice(String);
     method public void setDevicePorts(audio.policy.configuration.V4_0.DevicePorts);
     method public void setHalVersion(audio.policy.configuration.V4_0.HalVersion);
     method public void setMixPorts(audio.policy.configuration.V4_0.MixPorts);
-    method public void setName(java.lang.String);
+    method public void setName(String);
     method public void setRoutes(audio.policy.configuration.V4_0.Routes);
   }
 
   public class Profile {
     ctor public Profile();
-    method public java.lang.String getChannelMasks();
-    method public java.lang.String getFormat();
-    method public java.lang.String getName();
-    method public java.lang.String getSamplingRates();
-    method public void setChannelMasks(java.lang.String);
-    method public void setFormat(java.lang.String);
-    method public void setName(java.lang.String);
-    method public void setSamplingRates(java.lang.String);
+    method public String getChannelMasks();
+    method public String getFormat();
+    method public String getName();
+    method public String getSamplingRates();
+    method public void setChannelMasks(String);
+    method public void setFormat(String);
+    method public void setName(String);
+    method public void setSamplingRates(String);
   }
 
   public class Reference {
     ctor public Reference();
-    method public java.lang.String getName();
+    method public String getName();
     method public java.util.List<java.lang.String> getPoint();
-    method public void setName(java.lang.String);
+    method public void setName(String);
   }
 
-  public final class Role extends java.lang.Enum {
-    method public java.lang.String getRawName();
-    method public static audio.policy.configuration.V4_0.Role valueOf(java.lang.String);
-    method public static final audio.policy.configuration.V4_0.Role[] values();
+  public enum Role {
+    method public String getRawName();
     enum_constant public static final audio.policy.configuration.V4_0.Role sink;
     enum_constant public static final audio.policy.configuration.V4_0.Role source;
   }
@@ -339,18 +324,16 @@
 
   public static class Routes.Route {
     ctor public Routes.Route();
-    method public java.lang.String getSink();
-    method public java.lang.String getSources();
+    method public String getSink();
+    method public String getSources();
     method public audio.policy.configuration.V4_0.MixType getType();
-    method public void setSink(java.lang.String);
-    method public void setSources(java.lang.String);
+    method public void setSink(String);
+    method public void setSources(String);
     method public void setType(audio.policy.configuration.V4_0.MixType);
   }
 
-  public final class Stream extends java.lang.Enum {
-    method public java.lang.String getRawName();
-    method public static audio.policy.configuration.V4_0.Stream valueOf(java.lang.String);
-    method public static final audio.policy.configuration.V4_0.Stream[] values();
+  public enum Stream {
+    method public String getRawName();
     enum_constant public static final audio.policy.configuration.V4_0.Stream AUDIO_STREAM_ACCESSIBILITY;
     enum_constant public static final audio.policy.configuration.V4_0.Stream AUDIO_STREAM_ALARM;
     enum_constant public static final audio.policy.configuration.V4_0.Stream AUDIO_STREAM_BLUETOOTH_SCO;
@@ -366,10 +349,8 @@
     enum_constant public static final audio.policy.configuration.V4_0.Stream AUDIO_STREAM_VOICE_CALL;
   }
 
-  public final class Version extends java.lang.Enum {
-    method public java.lang.String getRawName();
-    method public static audio.policy.configuration.V4_0.Version valueOf(java.lang.String);
-    method public static final audio.policy.configuration.V4_0.Version[] values();
+  public enum Version {
+    method public String getRawName();
     enum_constant public static final audio.policy.configuration.V4_0.Version _1_0;
   }
 
@@ -377,10 +358,10 @@
     ctor public Volume();
     method public audio.policy.configuration.V4_0.DeviceCategory getDeviceCategory();
     method public java.util.List<java.lang.String> getPoint();
-    method public java.lang.String getRef();
+    method public String getRef();
     method public audio.policy.configuration.V4_0.Stream getStream();
     method public void setDeviceCategory(audio.policy.configuration.V4_0.DeviceCategory);
-    method public void setRef(java.lang.String);
+    method public void setRef(String);
     method public void setStream(audio.policy.configuration.V4_0.Stream);
   }
 
@@ -393,7 +374,7 @@
   public class XmlParser {
     ctor public XmlParser();
     method public static audio.policy.configuration.V4_0.AudioPolicyConfiguration read(java.io.InputStream) throws javax.xml.datatype.DatatypeConfigurationException, java.io.IOException, org.xmlpull.v1.XmlPullParserException;
-    method public static java.lang.String readText(org.xmlpull.v1.XmlPullParser) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
+    method public static String readText(org.xmlpull.v1.XmlPullParser) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
     method public static void skip(org.xmlpull.v1.XmlPullParser) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
   }
 
diff --git a/audio/4.0/config/api/removed.txt b/audio/4.0/config/api/removed.txt
index e69de29..d802177 100644
--- a/audio/4.0/config/api/removed.txt
+++ b/audio/4.0/config/api/removed.txt
@@ -0,0 +1 @@
+// Signature format: 2.0
diff --git a/audio/5.0/config/api/current.txt b/audio/5.0/config/api/current.txt
index 4334172..822237e 100644
--- a/audio/5.0/config/api/current.txt
+++ b/audio/5.0/config/api/current.txt
@@ -1,3 +1,4 @@
+// Signature format: 2.0
 package audio.policy.configuration.V5_0 {
 
   public class AttachedDevices {
@@ -5,10 +6,8 @@
     method public java.util.List<java.lang.String> getItem();
   }
 
-  public final class AudioDevice extends java.lang.Enum {
-    method public java.lang.String getRawName();
-    method public static audio.policy.configuration.V5_0.AudioDevice valueOf(java.lang.String);
-    method public static final audio.policy.configuration.V5_0.AudioDevice[] values();
+  public enum AudioDevice {
+    method public String getRawName();
     enum_constant public static final audio.policy.configuration.V5_0.AudioDevice AUDIO_DEVICE_IN_AMBIENT;
     enum_constant public static final audio.policy.configuration.V5_0.AudioDevice AUDIO_DEVICE_IN_ANLG_DOCK_HEADSET;
     enum_constant public static final audio.policy.configuration.V5_0.AudioDevice AUDIO_DEVICE_IN_AUX_DIGITAL;
@@ -72,10 +71,8 @@
     enum_constant public static final audio.policy.configuration.V5_0.AudioDevice AUDIO_DEVICE_OUT_WIRED_HEADSET;
   }
 
-  public final class AudioFormat extends java.lang.Enum {
-    method public java.lang.String getRawName();
-    method public static audio.policy.configuration.V5_0.AudioFormat valueOf(java.lang.String);
-    method public static final audio.policy.configuration.V5_0.AudioFormat[] values();
+  public enum AudioFormat {
+    method public String getRawName();
     enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_AAC;
     enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_AAC_ADIF;
     enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_AAC_ADTS;
@@ -156,10 +153,8 @@
     method public void setVersion(audio.policy.configuration.V5_0.Version);
   }
 
-  public final class AudioUsage extends java.lang.Enum {
-    method public java.lang.String getRawName();
-    method public static audio.policy.configuration.V5_0.AudioUsage valueOf(java.lang.String);
-    method public static final audio.policy.configuration.V5_0.AudioUsage[] values();
+  public enum AudioUsage {
+    method public String getRawName();
     enum_constant public static final audio.policy.configuration.V5_0.AudioUsage AUDIO_USAGE_ALARM;
     enum_constant public static final audio.policy.configuration.V5_0.AudioUsage AUDIO_USAGE_ASSISTANCE_ACCESSIBILITY;
     enum_constant public static final audio.policy.configuration.V5_0.AudioUsage AUDIO_USAGE_ASSISTANCE_NAVIGATION_GUIDANCE;
@@ -175,10 +170,8 @@
     enum_constant public static final audio.policy.configuration.V5_0.AudioUsage AUDIO_USAGE_VOICE_COMMUNICATION_SIGNALLING;
   }
 
-  public final class DeviceCategory extends java.lang.Enum {
-    method public java.lang.String getRawName();
-    method public static audio.policy.configuration.V5_0.DeviceCategory valueOf(java.lang.String);
-    method public static final audio.policy.configuration.V5_0.DeviceCategory[] values();
+  public enum DeviceCategory {
+    method public String getRawName();
     enum_constant public static final audio.policy.configuration.V5_0.DeviceCategory DEVICE_CATEGORY_EARPIECE;
     enum_constant public static final audio.policy.configuration.V5_0.DeviceCategory DEVICE_CATEGORY_EXT_MEDIA;
     enum_constant public static final audio.policy.configuration.V5_0.DeviceCategory DEVICE_CATEGORY_HEADSET;
@@ -193,25 +186,25 @@
 
   public static class DevicePorts.DevicePort {
     ctor public DevicePorts.DevicePort();
-    method public java.lang.String getAddress();
+    method public String getAddress();
+    method public java.util.List<audio.policy.configuration.V5_0.AudioFormat> getEncodedFormats();
     method public audio.policy.configuration.V5_0.Gains getGains();
     method public java.util.List<audio.policy.configuration.V5_0.Profile> getProfile();
     method public audio.policy.configuration.V5_0.Role getRole();
-    method public java.lang.String getTagName();
-    method public java.lang.String getType();
+    method public String getTagName();
+    method public String getType();
     method public boolean get_default();
-    method public void setAddress(java.lang.String);
+    method public void setAddress(String);
+    method public void setEncodedFormats(java.util.List<audio.policy.configuration.V5_0.AudioFormat>);
     method public void setGains(audio.policy.configuration.V5_0.Gains);
     method public void setRole(audio.policy.configuration.V5_0.Role);
-    method public void setTagName(java.lang.String);
-    method public void setType(java.lang.String);
+    method public void setTagName(String);
+    method public void setType(String);
     method public void set_default(boolean);
   }
 
-  public final class GainMode extends java.lang.Enum {
-    method public java.lang.String getRawName();
-    method public static audio.policy.configuration.V5_0.GainMode valueOf(java.lang.String);
-    method public static final audio.policy.configuration.V5_0.GainMode[] values();
+  public enum GainMode {
+    method public String getRawName();
     enum_constant public static final audio.policy.configuration.V5_0.GainMode AUDIO_GAIN_MODE_CHANNELS;
     enum_constant public static final audio.policy.configuration.V5_0.GainMode AUDIO_GAIN_MODE_JOINT;
     enum_constant public static final audio.policy.configuration.V5_0.GainMode AUDIO_GAIN_MODE_RAMP;
@@ -224,23 +217,23 @@
 
   public static class Gains.Gain {
     ctor public Gains.Gain();
-    method public java.lang.String getChannel_mask();
+    method public String getChannel_mask();
     method public int getDefaultValueMB();
     method public int getMaxRampMs();
     method public int getMaxValueMB();
     method public int getMinRampMs();
     method public int getMinValueMB();
     method public audio.policy.configuration.V5_0.GainMode getMode();
-    method public java.lang.String getName();
+    method public String getName();
     method public int getStepValueMB();
-    method public void setChannel_mask(java.lang.String);
+    method public void setChannel_mask(String);
     method public void setDefaultValueMB(int);
     method public void setMaxRampMs(int);
     method public void setMaxValueMB(int);
     method public void setMinRampMs(int);
     method public void setMinValueMB(int);
     method public void setMode(audio.policy.configuration.V5_0.GainMode);
-    method public void setName(java.lang.String);
+    method public void setName(String);
     method public void setStepValueMB(int);
   }
 
@@ -250,10 +243,8 @@
     method public void setSpeaker_drc_enabled(boolean);
   }
 
-  public final class HalVersion extends java.lang.Enum {
-    method public java.lang.String getRawName();
-    method public static audio.policy.configuration.V5_0.HalVersion valueOf(java.lang.String);
-    method public static final audio.policy.configuration.V5_0.HalVersion[] values();
+  public enum HalVersion {
+    method public String getRawName();
     enum_constant public static final audio.policy.configuration.V5_0.HalVersion _2_0;
     enum_constant public static final audio.policy.configuration.V5_0.HalVersion _3_0;
   }
@@ -265,27 +256,25 @@
 
   public static class MixPorts.MixPort {
     ctor public MixPorts.MixPort();
-    method public java.lang.String getFlags();
+    method public String getFlags();
     method public audio.policy.configuration.V5_0.Gains getGains();
     method public long getMaxActiveCount();
     method public long getMaxOpenCount();
-    method public java.lang.String getName();
+    method public String getName();
     method public java.util.List<audio.policy.configuration.V5_0.AudioUsage> getPreferredUsage();
     method public java.util.List<audio.policy.configuration.V5_0.Profile> getProfile();
     method public audio.policy.configuration.V5_0.Role getRole();
-    method public void setFlags(java.lang.String);
+    method public void setFlags(String);
     method public void setGains(audio.policy.configuration.V5_0.Gains);
     method public void setMaxActiveCount(long);
     method public void setMaxOpenCount(long);
-    method public void setName(java.lang.String);
+    method public void setName(String);
     method public void setPreferredUsage(java.util.List<audio.policy.configuration.V5_0.AudioUsage>);
     method public void setRole(audio.policy.configuration.V5_0.Role);
   }
 
-  public final class MixType extends java.lang.Enum {
-    method public java.lang.String getRawName();
-    method public static audio.policy.configuration.V5_0.MixType valueOf(java.lang.String);
-    method public static final audio.policy.configuration.V5_0.MixType[] values();
+  public enum MixType {
+    method public String getRawName();
     enum_constant public static final audio.policy.configuration.V5_0.MixType mix;
     enum_constant public static final audio.policy.configuration.V5_0.MixType mux;
   }
@@ -298,44 +287,42 @@
   public static class Modules.Module {
     ctor public Modules.Module();
     method public audio.policy.configuration.V5_0.AttachedDevices getAttachedDevices();
-    method public java.lang.String getDefaultOutputDevice();
+    method public String getDefaultOutputDevice();
     method public audio.policy.configuration.V5_0.DevicePorts getDevicePorts();
     method public audio.policy.configuration.V5_0.HalVersion getHalVersion();
     method public audio.policy.configuration.V5_0.MixPorts getMixPorts();
-    method public java.lang.String getName();
+    method public String getName();
     method public audio.policy.configuration.V5_0.Routes getRoutes();
     method public void setAttachedDevices(audio.policy.configuration.V5_0.AttachedDevices);
-    method public void setDefaultOutputDevice(java.lang.String);
+    method public void setDefaultOutputDevice(String);
     method public void setDevicePorts(audio.policy.configuration.V5_0.DevicePorts);
     method public void setHalVersion(audio.policy.configuration.V5_0.HalVersion);
     method public void setMixPorts(audio.policy.configuration.V5_0.MixPorts);
-    method public void setName(java.lang.String);
+    method public void setName(String);
     method public void setRoutes(audio.policy.configuration.V5_0.Routes);
   }
 
   public class Profile {
     ctor public Profile();
-    method public java.lang.String getChannelMasks();
-    method public java.lang.String getFormat();
-    method public java.lang.String getName();
-    method public java.lang.String getSamplingRates();
-    method public void setChannelMasks(java.lang.String);
-    method public void setFormat(java.lang.String);
-    method public void setName(java.lang.String);
-    method public void setSamplingRates(java.lang.String);
+    method public String getChannelMasks();
+    method public String getFormat();
+    method public String getName();
+    method public String getSamplingRates();
+    method public void setChannelMasks(String);
+    method public void setFormat(String);
+    method public void setName(String);
+    method public void setSamplingRates(String);
   }
 
   public class Reference {
     ctor public Reference();
-    method public java.lang.String getName();
+    method public String getName();
     method public java.util.List<java.lang.String> getPoint();
-    method public void setName(java.lang.String);
+    method public void setName(String);
   }
 
-  public final class Role extends java.lang.Enum {
-    method public java.lang.String getRawName();
-    method public static audio.policy.configuration.V5_0.Role valueOf(java.lang.String);
-    method public static final audio.policy.configuration.V5_0.Role[] values();
+  public enum Role {
+    method public String getRawName();
     enum_constant public static final audio.policy.configuration.V5_0.Role sink;
     enum_constant public static final audio.policy.configuration.V5_0.Role source;
   }
@@ -347,18 +334,16 @@
 
   public static class Routes.Route {
     ctor public Routes.Route();
-    method public java.lang.String getSink();
-    method public java.lang.String getSources();
+    method public String getSink();
+    method public String getSources();
     method public audio.policy.configuration.V5_0.MixType getType();
-    method public void setSink(java.lang.String);
-    method public void setSources(java.lang.String);
+    method public void setSink(String);
+    method public void setSources(String);
     method public void setType(audio.policy.configuration.V5_0.MixType);
   }
 
-  public final class Stream extends java.lang.Enum {
-    method public java.lang.String getRawName();
-    method public static audio.policy.configuration.V5_0.Stream valueOf(java.lang.String);
-    method public static final audio.policy.configuration.V5_0.Stream[] values();
+  public enum Stream {
+    method public String getRawName();
     enum_constant public static final audio.policy.configuration.V5_0.Stream AUDIO_STREAM_ACCESSIBILITY;
     enum_constant public static final audio.policy.configuration.V5_0.Stream AUDIO_STREAM_ALARM;
     enum_constant public static final audio.policy.configuration.V5_0.Stream AUDIO_STREAM_BLUETOOTH_SCO;
@@ -393,10 +378,8 @@
     method public void setFormats(audio.policy.configuration.V5_0.SurroundFormats);
   }
 
-  public final class Version extends java.lang.Enum {
-    method public java.lang.String getRawName();
-    method public static audio.policy.configuration.V5_0.Version valueOf(java.lang.String);
-    method public static final audio.policy.configuration.V5_0.Version[] values();
+  public enum Version {
+    method public String getRawName();
     enum_constant public static final audio.policy.configuration.V5_0.Version _1_0;
   }
 
@@ -404,10 +387,10 @@
     ctor public Volume();
     method public audio.policy.configuration.V5_0.DeviceCategory getDeviceCategory();
     method public java.util.List<java.lang.String> getPoint();
-    method public java.lang.String getRef();
+    method public String getRef();
     method public audio.policy.configuration.V5_0.Stream getStream();
     method public void setDeviceCategory(audio.policy.configuration.V5_0.DeviceCategory);
-    method public void setRef(java.lang.String);
+    method public void setRef(String);
     method public void setStream(audio.policy.configuration.V5_0.Stream);
   }
 
@@ -420,7 +403,7 @@
   public class XmlParser {
     ctor public XmlParser();
     method public static audio.policy.configuration.V5_0.AudioPolicyConfiguration read(java.io.InputStream) throws javax.xml.datatype.DatatypeConfigurationException, java.io.IOException, org.xmlpull.v1.XmlPullParserException;
-    method public static java.lang.String readText(org.xmlpull.v1.XmlPullParser) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
+    method public static String readText(org.xmlpull.v1.XmlPullParser) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
     method public static void skip(org.xmlpull.v1.XmlPullParser) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
   }
 
diff --git a/audio/5.0/config/api/removed.txt b/audio/5.0/config/api/removed.txt
index e69de29..d802177 100644
--- a/audio/5.0/config/api/removed.txt
+++ b/audio/5.0/config/api/removed.txt
@@ -0,0 +1 @@
+// Signature format: 2.0
diff --git a/audio/5.0/config/audio_policy_configuration.xsd b/audio/5.0/config/audio_policy_configuration.xsd
index b0927b2..efe93b3 100644
--- a/audio/5.0/config/audio_policy_configuration.xsd
+++ b/audio/5.0/config/audio_policy_configuration.xsd
@@ -461,6 +461,8 @@
                             </xs:documentation>
                         </xs:annotation>
                     </xs:attribute>
+                    <xs:attribute name="encodedFormats" type="audioFormatsList" use="optional"
+                                  default="" />
                 </xs:complexType>
                 <xs:unique name="devicePortProfileUniqueness">
                     <xs:selector xpath="profile"/>
@@ -595,7 +597,7 @@
             <xs:element name="formats" type="surroundFormats"/>
         </xs:sequence>
     </xs:complexType>
-    <xs:simpleType name="surroundFormatsList">
+    <xs:simpleType name="audioFormatsList">
         <xs:list itemType="audioFormat" />
     </xs:simpleType>
     <xs:complexType name="surroundFormats">
@@ -603,7 +605,7 @@
             <xs:element name="format" minOccurs="0" maxOccurs="unbounded">
                 <xs:complexType>
                     <xs:attribute name="name" type="audioFormat" use="required"/>
-                    <xs:attribute name="subformats" type="surroundFormatsList" />
+                    <xs:attribute name="subformats" type="audioFormatsList" />
                 </xs:complexType>
             </xs:element>
         </xs:sequence>
diff --git a/audio/core/all-versions/vts/functional/AudioPrimaryHidlHalTest.h b/audio/core/all-versions/vts/functional/AudioPrimaryHidlHalTest.h
index ec8041c..a22cc1c 100644
--- a/audio/core/all-versions/vts/functional/AudioPrimaryHidlHalTest.h
+++ b/audio/core/all-versions/vts/functional/AudioPrimaryHidlHalTest.h
@@ -428,7 +428,8 @@
         if (policyConfig.getStatus() != OK || policyConfig.getPrimaryModule() == nullptr) {
             return true;  // Could not get the information, run all tests
         }
-        auto getMic = [](auto& devs) { return devs.getDevice(AUDIO_DEVICE_IN_BUILTIN_MIC, {}); };
+        auto getMic = [](auto& devs) { return devs.getDevice(
+                AUDIO_DEVICE_IN_BUILTIN_MIC, {}, AUDIO_FORMAT_DEFAULT); };
         auto primaryMic = getMic(policyConfig.getPrimaryModule()->getDeclaredDevices());
         auto availableMic = getMic(policyConfig.getAvailableInputDevices());
 
diff --git a/audio/effect/5.0/xml/api/current.txt b/audio/effect/5.0/xml/api/current.txt
index 294501d..4a7f88b 100644
--- a/audio/effect/5.0/xml/api/current.txt
+++ b/audio/effect/5.0/xml/api/current.txt
@@ -1,3 +1,4 @@
+// Signature format: 2.0
 package audio.effects.V5_0 {
 
   public class Audioeffectsconf {
@@ -26,10 +27,10 @@
 
   public class EffectImplType {
     ctor public EffectImplType();
-    method public java.lang.String getLibrary();
-    method public java.lang.String getUuid();
-    method public void setLibrary(java.lang.String);
-    method public void setUuid(java.lang.String);
+    method public String getLibrary();
+    method public String getUuid();
+    method public void setLibrary(String);
+    method public void setUuid(String);
   }
 
   public class EffectProxyType extends audio.effects.V5_0.EffectType {
@@ -42,8 +43,8 @@
 
   public class EffectType extends audio.effects.V5_0.EffectImplType {
     ctor public EffectType();
-    method public java.lang.String getName();
-    method public void setName(java.lang.String);
+    method public String getName();
+    method public void setName(String);
   }
 
   public class EffectsType {
@@ -59,16 +60,14 @@
 
   public static class LibrariesType.Library {
     ctor public LibrariesType.Library();
-    method public java.lang.String getName();
-    method public java.lang.String getPath();
-    method public void setName(java.lang.String);
-    method public void setPath(java.lang.String);
+    method public String getName();
+    method public String getPath();
+    method public void setName(String);
+    method public void setPath(String);
   }
 
-  public final class StreamInputType extends java.lang.Enum {
-    method public java.lang.String getRawName();
-    method public static audio.effects.V5_0.StreamInputType valueOf(java.lang.String);
-    method public static final audio.effects.V5_0.StreamInputType[] values();
+  public enum StreamInputType {
+    method public String getRawName();
     enum_constant public static final audio.effects.V5_0.StreamInputType camcorder;
     enum_constant public static final audio.effects.V5_0.StreamInputType mic;
     enum_constant public static final audio.effects.V5_0.StreamInputType unprocessed;
@@ -79,10 +78,8 @@
     enum_constant public static final audio.effects.V5_0.StreamInputType voice_uplink;
   }
 
-  public final class StreamOutputType extends java.lang.Enum {
-    method public java.lang.String getRawName();
-    method public static audio.effects.V5_0.StreamOutputType valueOf(java.lang.String);
-    method public static final audio.effects.V5_0.StreamOutputType[] values();
+  public enum StreamOutputType {
+    method public String getRawName();
     enum_constant public static final audio.effects.V5_0.StreamOutputType alarm;
     enum_constant public static final audio.effects.V5_0.StreamOutputType bluetooth_sco;
     enum_constant public static final audio.effects.V5_0.StreamOutputType dtmf;
@@ -114,21 +111,19 @@
 
   public static class StreamProcessingType.Apply {
     ctor public StreamProcessingType.Apply();
-    method public java.lang.String getEffect();
-    method public void setEffect(java.lang.String);
+    method public String getEffect();
+    method public void setEffect(String);
   }
 
-  public final class VersionType extends java.lang.Enum {
-    method public java.lang.String getRawName();
-    method public static audio.effects.V5_0.VersionType valueOf(java.lang.String);
-    method public static final audio.effects.V5_0.VersionType[] values();
+  public enum VersionType {
+    method public String getRawName();
     enum_constant public static final audio.effects.V5_0.VersionType _2_0;
   }
 
   public class XmlParser {
     ctor public XmlParser();
     method public static audio.effects.V5_0.Audioeffectsconf read(java.io.InputStream) throws javax.xml.datatype.DatatypeConfigurationException, java.io.IOException, org.xmlpull.v1.XmlPullParserException;
-    method public static java.lang.String readText(org.xmlpull.v1.XmlPullParser) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
+    method public static String readText(org.xmlpull.v1.XmlPullParser) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
     method public static void skip(org.xmlpull.v1.XmlPullParser) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
   }
 
diff --git a/audio/effect/5.0/xml/api/removed.txt b/audio/effect/5.0/xml/api/removed.txt
index e69de29..d802177 100644
--- a/audio/effect/5.0/xml/api/removed.txt
+++ b/audio/effect/5.0/xml/api/removed.txt
@@ -0,0 +1 @@
+// Signature format: 2.0
diff --git a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
index 60db5df..c98e328 100644
--- a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
+++ b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
@@ -3268,6 +3268,8 @@
             continue;
         }
 
+        outputPreviewStreams.clear();
+
         ASSERT_EQ(Status::OK, getAvailableOutputStreams(staticMetaBuffer, outputPreviewStreams,
                 &previewThreshold));
         ASSERT_NE(0u, outputPreviewStreams.size());
diff --git a/drm/1.2/IDrmPlugin.hal b/drm/1.2/IDrmPlugin.hal
index 88ace0b..3c21815 100644
--- a/drm/1.2/IDrmPlugin.hal
+++ b/drm/1.2/IDrmPlugin.hal
@@ -184,6 +184,40 @@
         generates (Status status, vec<uint8_t> request, string defaultUrl);
 
     /**
+     * Return the currently negotiated and max supported HDCP levels.
+     *
+     * This method only differs from @1.1 version by the addition of
+     * support for HDCP 2.3.
+     *
+     * The current level is based on the display(s) the device is connected to.
+     * If multiple HDCP-capable displays are simultaneously connected to
+     * separate interfaces, this method returns the lowest negotiated HDCP level
+     * of all interfaces.
+     *
+     * The maximum HDCP level is the highest level that can potentially be
+     * negotiated. It is a constant for any device, i.e. it does not depend on
+     * downstream receiving devices that could be connected. For example, if
+     * the device has HDCP 1.x keys and is capable of negotiating HDCP 1.x, but
+     * does not have HDCP 2.x keys, then the maximum HDCP capability would be
+     * reported as 1.x. If multiple HDCP-capable interfaces are present, it
+     * indicates the highest of the maximum HDCP levels of all interfaces.
+     *
+     * This method should only be used for informational purposes, not for
+     * enforcing compliance with HDCP requirements. Trusted enforcement of HDCP
+     * policies must be handled by the DRM system.
+     *
+     * @return status the status of the call. The status must be OK or
+     *         ERROR_DRM_INVALID_STATE if the HAL is in a state where the HDCP
+     *         level cannot be queried.
+     * @return connectedLevel the lowest HDCP level for any connected
+     *         displays
+     * @return maxLevel the highest HDCP level that can be supported
+     *         by the device
+     */
+    getHdcpLevels_1_2() generates (Status status, HdcpLevel connectedLevel,
+            HdcpLevel maxLevel);
+
+    /**
      * Send a session lost state event to the listener. This event
      * indicates that a session's state has become invalid because the
      * device crypto hardware is incapable of retaining crypto session
diff --git a/drm/1.2/types.hal b/drm/1.2/types.hal
index 6e1acde..28c8e67 100644
--- a/drm/1.2/types.hal
+++ b/drm/1.2/types.hal
@@ -17,6 +17,7 @@
 package android.hardware.drm@1.2;
 
 import @1.0::Status;
+import @1.1::HdcpLevel;
 
 enum OfflineLicenseState : uint32_t {
     /**
@@ -72,6 +73,19 @@
 };
 
 /**
+ * HDCP specifications are defined by Digital Content Protection LLC (DCP).
+ *   "HDCP Specification Rev. 2.3 Interface Independent Adaptation"
+ *   "HDCP 2.3 on HDMI Specification"
+ */
+enum HdcpLevel : @1.1::HdcpLevel {
+    /**
+     * HDCP version 2.3 Type 1.
+     */
+    HDCP_V2_3
+};
+
+
+/**
  * KeySetId is an identifier that references a set of keys in an
  * offline license. The keySetId is created by the HAL implementation
  * and returned from provideKeyResponse and getOfflineLicenseIds. The
diff --git a/gnss/measurement_corrections/1.0/types.hal b/gnss/measurement_corrections/1.0/types.hal
index 4b48e4e..5f20734 100644
--- a/gnss/measurement_corrections/1.0/types.hal
+++ b/gnss/measurement_corrections/1.0/types.hal
@@ -47,8 +47,11 @@
      */
     float carrierFrequencyHz;
 
-    /** True if the satellite is in Line-of-Sight condition */
-    bool satIsLos;
+    /**
+     * The probability that the satellite is estimated to be in Line-of-Sight condition at the given
+     * location.
+     */
+    float probSatIsLos;
 
     /**
      * Excess path length to be subtracted from pseudorange before using it in calculating location.
@@ -123,8 +126,8 @@
 
 /** Bit mask to indicate which values are valid in a SingleSatCorrection object. */
 enum GnssSingleSatCorrectionFlags : uint16_t {
-    /** GnssSingleSatCorrectionFlags has valid satellite-is-line-of-sight field. */
-    HAS_SAT_IS_LOS                           = 0x0001,
+    /** GnssSingleSatCorrectionFlags has valid satellite-is-line-of-sight-probability field. */
+    HAS_SAT_IS_LOS_PROBABILITY               = 0x0001,
     /** GnssSingleSatCorrectionFlags has valid Excess Path Length field. */
     HAS_EXCESS_PATH_LENGTH                   = 0x0002,
     /** GnssSingleSatCorrectionFlags has valid Excess Path Length Uncertainty field. */
diff --git a/graphics/allocator/3.0/IAllocator.hal b/graphics/allocator/3.0/IAllocator.hal
index 3651e91..34b08e7 100644
--- a/graphics/allocator/3.0/IAllocator.hal
+++ b/graphics/allocator/3.0/IAllocator.hal
@@ -30,6 +30,9 @@
     /**
      * Allocates buffers with the properties specified by the descriptor.
      *
+     * Allocations should be optimized for usage bits provided in the
+     * descriptor.
+     *
      * @param descriptor Properties of the buffers to allocate. This must be
      *     obtained from IMapper::createDescriptor().
      * @param count The number of buffers to allocate.
diff --git a/graphics/mapper/3.0/IMapper.hal b/graphics/mapper/3.0/IMapper.hal
index e399045..a0e4d7a 100644
--- a/graphics/mapper/3.0/IMapper.hal
+++ b/graphics/mapper/3.0/IMapper.hal
@@ -183,6 +183,9 @@
      * buffer content in an indeterminate state or returning an error are both
      * acceptable.
      *
+     * 1D buffers (width = size in bytes, height = 1, pixel_format = BLOB) must
+     * "lock in place". The buffers must be directly accessible via mapping.
+     *
      * The client must not modify the content of the buffer outside of
      * @p accessRegion, and the device need not guarantee that content outside
      * of @p accessRegion is valid for reading. The result of reading or writing
@@ -193,6 +196,12 @@
      * memory. This address will represent the top-left corner of the entire
      * buffer, even if @p accessRegion does not begin at the top-left corner.
      *
+     * On success, bytesPerPixel must contain the number of bytes per pixel in
+     * the buffer. If the bytesPerPixel is unknown or variable, a value of -1
+     * should be returned. bytesPerStride must contain the bytes per stride of
+     * the buffer. If the bytesPerStride is unknown or variable, a value of -1
+     * should be returned.
+     *
      * @param buffer Buffer to lock.
      * @param cpuUsage CPU usage flags to request. See +ndk
      *     libnativewindow#AHardwareBuffer_UsageFlags for possible values.
@@ -211,13 +220,17 @@
      *     - `NO_RESOURCES` if the buffer cannot be locked at this time. Note
      *       that locking may succeed at a later time.
      * @return data CPU-accessible pointer to the buffer data.
+     * @return bytesPerPixel the number of bytes per pixel in the buffer
+     * @return bytesPerStride the number of bytes per stride of the buffer
      */
     lock(pointer buffer,
          uint64_t cpuUsage,
          Rect accessRegion,
          handle acquireFence)
             generates (Error error,
-                       pointer data);
+                       pointer data,
+                       int32_t bytesPerPixel,
+                       int32_t bytesPerStride);
 
     /**
      * Locks a YCbCr buffer for the specified CPU usage.
@@ -272,5 +285,20 @@
      */
     unlock(pointer buffer) generates (Error error, handle releaseFence);
 
+    /**
+     * Test whether the given BufferDescriptorInfo is allocatable.
+     *
+     * If this function returns true, it means that a buffer with the given
+     * description can be allocated on this implementation, unless resource
+     * exhaustion occurs. If this function returns false, it means that the
+     * allocation of the given description will never succeed.
+     *
+     * @param description the description of the buffer
+     * @return supported whether the description is supported
+     */
+    isSupported(BufferDescriptorInfo description)
+            generates (Error error,
+                       bool supported);
+
 };
 
diff --git a/graphics/mapper/3.0/utils/vts/MapperVts.cpp b/graphics/mapper/3.0/utils/vts/MapperVts.cpp
index 8428403..f2b7594 100644
--- a/graphics/mapper/3.0/utils/vts/MapperVts.cpp
+++ b/graphics/mapper/3.0/utils/vts/MapperVts.cpp
@@ -164,7 +164,8 @@
 }
 
 void* Gralloc::lock(const native_handle_t* bufferHandle, uint64_t cpuUsage,
-                    const IMapper::Rect& accessRegion, int acquireFence) {
+                    const IMapper::Rect& accessRegion, int acquireFence, int32_t* outBytesPerPixel,
+                    int32_t* outBytesPerStride) {
     auto buffer = const_cast<native_handle_t*>(bufferHandle);
 
     NATIVE_HANDLE_DECLARE_STORAGE(acquireFenceStorage, 1, 0);
@@ -175,11 +176,17 @@
         acquireFenceHandle = h;
     }
 
+    *outBytesPerPixel = -1;
+    *outBytesPerStride = -1;
+
     void* data = nullptr;
     mMapper->lock(buffer, cpuUsage, accessRegion, acquireFenceHandle,
-                  [&](const auto& tmpError, const auto& tmpData) {
+                  [&](const auto& tmpError, const auto& tmpData, int32_t tmpBytesPerPixel,
+                      int32_t tmpBytesPerStride) {
                       ASSERT_EQ(Error::NONE, tmpError) << "failed to lock buffer " << buffer;
                       data = tmpData;
+                      *outBytesPerPixel = tmpBytesPerPixel;
+                      *outBytesPerStride = tmpBytesPerStride;
                   });
 
     if (acquireFence >= 0) {
@@ -264,6 +271,15 @@
         });
 }
 
+bool Gralloc::isSupported(const IMapper::BufferDescriptorInfo& descriptorInfo) {
+    bool supported = false;
+    mMapper->isSupported(descriptorInfo, [&](const auto& tmpError, const auto& tmpSupported) {
+        ASSERT_EQ(Error::NONE, tmpError) << "failed to check is supported";
+        supported = tmpSupported;
+    });
+    return supported;
+}
+
 }  // namespace vts
 }  // namespace V3_0
 }  // namespace mapper
diff --git a/graphics/mapper/3.0/utils/vts/include/mapper-vts/3.0/MapperVts.h b/graphics/mapper/3.0/utils/vts/include/mapper-vts/3.0/MapperVts.h
index c94961c..ba79ca4 100644
--- a/graphics/mapper/3.0/utils/vts/include/mapper-vts/3.0/MapperVts.h
+++ b/graphics/mapper/3.0/utils/vts/include/mapper-vts/3.0/MapperVts.h
@@ -68,7 +68,8 @@
     // in and out of the mapper.  The ownership of the fd is always transferred
     // with each of these functions.
     void* lock(const native_handle_t* bufferHandle, uint64_t cpuUsage,
-               const IMapper::Rect& accessRegion, int acquireFence);
+               const IMapper::Rect& accessRegion, int acquireFence, int32_t* outBytesPerPixel,
+               int32_t* outBytesPerStride);
     YCbCrLayout lockYCbCr(const native_handle_t* bufferHandle, uint64_t cpuUsage,
                           const IMapper::Rect& accessRegion, int acquireFence);
     int unlock(const native_handle_t* bufferHandle);
@@ -78,6 +79,8 @@
     void getTransportSize(const native_handle_t* bufferHandle, uint32_t* outNumFds,
                           uint32_t* outNumInts);
 
+    bool isSupported(const IMapper::BufferDescriptorInfo& descriptorInfo);
+
    private:
     void init(const std::string& allocatorServiceName, const std::string& mapperServiceName);
     const native_handle_t* cloneBuffer(const hidl_handle& rawHandle);
diff --git a/graphics/mapper/3.0/vts/functional/VtsHalGraphicsMapperV3_0TargetTest.cpp b/graphics/mapper/3.0/vts/functional/VtsHalGraphicsMapperV3_0TargetTest.cpp
index 430a526..cfae635 100644
--- a/graphics/mapper/3.0/vts/functional/VtsHalGraphicsMapperV3_0TargetTest.cpp
+++ b/graphics/mapper/3.0/vts/functional/VtsHalGraphicsMapperV3_0TargetTest.cpp
@@ -298,8 +298,15 @@
                                static_cast<int32_t>(info.height)};
     int fence = -1;
     uint8_t* data;
+    int32_t bytesPerPixel = -1;
+    int32_t bytesPerStride = -1;
     ASSERT_NO_FATAL_FAILURE(
-        data = static_cast<uint8_t*>(mGralloc->lock(bufferHandle, info.usage, region, fence)));
+            data = static_cast<uint8_t*>(mGralloc->lock(bufferHandle, info.usage, region, fence,
+                                                        &bytesPerPixel, &bytesPerStride)));
+
+    // Valid return values are -1 for unsupported or the number bytes for supported which is >=0
+    EXPECT_GT(bytesPerPixel, -1);
+    EXPECT_GT(bytesPerStride, -1);
 
     // RGBA_8888
     size_t strideInBytes = stride * 4;
@@ -312,9 +319,13 @@
 
     ASSERT_NO_FATAL_FAILURE(fence = mGralloc->unlock(bufferHandle));
 
+    bytesPerPixel = -1;
+    bytesPerStride = -1;
+
     // lock again for reading
     ASSERT_NO_FATAL_FAILURE(
-        data = static_cast<uint8_t*>(mGralloc->lock(bufferHandle, info.usage, region, fence)));
+            data = static_cast<uint8_t*>(mGralloc->lock(bufferHandle, info.usage, region, fence,
+                                                        &bytesPerPixel, &bytesPerStride)));
     for (uint32_t y = 0; y < info.height; y++) {
         for (size_t i = 0; i < writeInBytes; i++) {
             EXPECT_EQ(static_cast<uint8_t>(y), data[i]);
@@ -322,6 +333,9 @@
         data += strideInBytes;
     }
 
+    EXPECT_GT(bytesPerPixel, -1);
+    EXPECT_GT(bytesPerStride, -1);
+
     ASSERT_NO_FATAL_FAILURE(fence = mGralloc->unlock(bufferHandle));
     if (fence >= 0) {
         close(fence);
@@ -426,6 +440,40 @@
 #endif
 }
 
+/**
+ * Test IMapper::isSupported with required format RGBA_8888
+ */
+TEST_F(GraphicsMapperHidlTest, IsSupportedRGBA8888) {
+    const auto& info = mDummyDescriptorInfo;
+    bool supported = false;
+
+    ASSERT_NO_FATAL_FAILURE(supported = mGralloc->isSupported(info));
+    ASSERT_TRUE(supported);
+}
+
+/**
+ * Test IMapper::isSupported with required format YV12
+ */
+TEST_F(GraphicsMapperHidlTest, IsSupportedYV12) {
+    auto info = mDummyDescriptorInfo;
+    info.format = PixelFormat::YV12;
+    bool supported = false;
+
+    ASSERT_NO_FATAL_FAILURE(supported = mGralloc->isSupported(info));
+    ASSERT_TRUE(supported);
+}
+
+/**
+ * Test IMapper::isSupported with optional format Y16
+ */
+TEST_F(GraphicsMapperHidlTest, IsSupportedY16) {
+    auto info = mDummyDescriptorInfo;
+    info.format = PixelFormat::Y16;
+    bool supported = false;
+
+    ASSERT_NO_FATAL_FAILURE(supported = mGralloc->isSupported(info));
+}
+
 }  // namespace
 }  // namespace vts
 }  // namespace V3_0
diff --git a/neuralnetworks/1.0/vts/functional/GeneratedTestHarness.cpp b/neuralnetworks/1.0/vts/functional/GeneratedTestHarness.cpp
index b5a8607..d45922e 100644
--- a/neuralnetworks/1.0/vts/functional/GeneratedTestHarness.cpp
+++ b/neuralnetworks/1.0/vts/functional/GeneratedTestHarness.cpp
@@ -45,20 +45,16 @@
 using ::test_helper::compare;
 using ::test_helper::expectMultinomialDistributionWithinTolerance;
 using ::test_helper::filter;
-using ::test_helper::Float32Operands;
 using ::test_helper::for_all;
 using ::test_helper::for_each;
-using ::test_helper::Int32Operands;
 using ::test_helper::MixedTyped;
 using ::test_helper::MixedTypedExample;
-using ::test_helper::MixedTypedIndex;
-using ::test_helper::Quant8Operands;
 using ::test_helper::resize_accordingly;
 
 template <typename T>
-void copy_back_(MixedTyped* dst, const std::vector<RequestArgument>& ra, char* src) {
-    MixedTyped& test = *dst;
-    for_each<T>(test, [&ra, src](int index, std::vector<T>& m) {
+void copy_back_(std::map<int, std::vector<T>>* dst, const std::vector<RequestArgument>& ra,
+                char* src) {
+    for_each<T>(*dst, [&ra, src](int index, std::vector<T>& m) {
         ASSERT_EQ(m.size(), ra[index].location.length / sizeof(T));
         char* begin = src + ra[index].location.offset;
         memcpy(m.data(), begin, ra[index].location.length);
@@ -66,14 +62,15 @@
 }
 
 void copy_back(MixedTyped* dst, const std::vector<RequestArgument>& ra, char* src) {
-    copy_back_<float>(dst, ra, src);
-    copy_back_<int32_t>(dst, ra, src);
-    copy_back_<uint8_t>(dst, ra, src);
-    copy_back_<int16_t>(dst, ra, src);
-    copy_back_<_Float16>(dst, ra, src);
-    copy_back_<bool8>(dst, ra, src);
-    copy_back_<int8_t>(dst, ra, src);
-    static_assert(7 == std::tuple_size<MixedTyped>::value,
+    copy_back_(&dst->float32Operands, ra, src);
+    copy_back_(&dst->int32Operands, ra, src);
+    copy_back_(&dst->quant8AsymmOperands, ra, src);
+    copy_back_(&dst->quant16SymmOperands, ra, src);
+    copy_back_(&dst->float16Operands, ra, src);
+    copy_back_(&dst->bool8Operands, ra, src);
+    copy_back_(&dst->quant8ChannelOperands, ra, src);
+    copy_back_(&dst->quant16AsymmOperands, ra, src);
+    static_assert(8 == MixedTyped::kNumTypes,
                   "Number of types in MixedTyped changed, but copy_back function wasn't updated");
 }
 
@@ -115,7 +112,8 @@
 void EvaluatePreparedModel(sp<T_IPreparedModel>& preparedModel, std::function<bool(int)> is_ignored,
                            const std::vector<MixedTypedExample>& examples,
                            bool hasRelaxedFloat32Model = false, float fpAtol = kDefaultAtol,
-                           float fpRtol = kDefaultRtol, Synchronously sync = Synchronously::NO) {
+                           float fpRtol = kDefaultRtol, Synchronously sync = Synchronously::NO,
+                           bool testDynamicOutputShape = false) {
     const uint32_t INPUT = 0;
     const uint32_t OUTPUT = 1;
 
@@ -125,7 +123,7 @@
         const MixedTyped& inputs = example.operands.first;
         const MixedTyped& golden = example.operands.second;
 
-        const bool hasFloat16Inputs = !std::get<MixedTypedIndex<_Float16>::index>(inputs).empty();
+        const bool hasFloat16Inputs = !inputs.float16Operands.empty();
         if (hasRelaxedFloat32Model || hasFloat16Inputs) {
             // TODO: Adjust the error limit based on testing.
             // If in relaxed mode, set the absolute tolerance to be 5ULP of FP16.
@@ -237,10 +235,24 @@
             executionStatus = static_cast<ErrorStatus>(executionReturnStatus);
         }
 
+        if (testDynamicOutputShape && executionStatus != ErrorStatus::NONE) {
+            LOG(INFO) << "NN VTS: Early termination of test because vendor service cannot "
+                         "execute model that it does not support.";
+            std::cout << "[          ]   Early termination of test because vendor service cannot "
+                         "execute model that it does not support."
+                      << std::endl;
+            return;
+        }
         ASSERT_EQ(ErrorStatus::NONE, executionStatus);
-        // TODO(xusongw): Check if the returned output shapes match with expectation once the
-        //                sample driver implementation of dynamic output shape is finished.
-        ASSERT_EQ(outputShapes.size(), 0);
+
+        // Go through all outputs, overwrite output dimensions with returned output shapes
+        if (testDynamicOutputShape) {
+            ASSERT_NE(outputShapes.size(), 0);
+            for_each<uint32_t>(test.operandDimensions,
+                               [&outputShapes](int idx, std::vector<uint32_t>& dim) {
+                                   dim = outputShapes[idx].dimensions;
+                               });
+        }
 
         // validate results
         outputMemory->read();
@@ -261,9 +273,10 @@
 template <typename T_IPreparedModel>
 void EvaluatePreparedModel(sp<T_IPreparedModel>& preparedModel, std::function<bool(int)> is_ignored,
                            const std::vector<MixedTypedExample>& examples,
-                           bool hasRelaxedFloat32Model, Synchronously sync) {
+                           bool hasRelaxedFloat32Model, Synchronously sync,
+                           bool testDynamicOutputShape) {
     EvaluatePreparedModel(preparedModel, is_ignored, examples, hasRelaxedFloat32Model, kDefaultAtol,
-                          kDefaultRtol, sync);
+                          kDefaultRtol, sync, testDynamicOutputShape);
 }
 
 static void getPreparedModel(sp<PreparedModelCallback> callback,
@@ -319,7 +332,8 @@
 
     float fpAtol = 1e-5f, fpRtol = 5.0f * 1.1920928955078125e-7f;
     EvaluatePreparedModel(preparedModel, is_ignored, examples,
-                          /*hasRelaxedFloat32Model=*/false, fpAtol, fpRtol);
+                          /*hasRelaxedFloat32Model=*/false, fpAtol, fpRtol, Synchronously::NO,
+                          /*testDynamicOutputShape=*/false);
 }
 
 void Execute(const sp<V1_1::IDevice>& device, std::function<V1_1::Model(void)> create_model,
@@ -365,12 +379,14 @@
     ASSERT_NE(nullptr, preparedModel.get());
 
     EvaluatePreparedModel(preparedModel, is_ignored, examples,
-                          model.relaxComputationFloat32toFloat16);
+                          model.relaxComputationFloat32toFloat16, 1e-5f, 1e-5f, Synchronously::NO,
+                          /*testDynamicOutputShape=*/false);
 }
 
 // TODO: Reduce code duplication.
 void Execute(const sp<V1_2::IDevice>& device, std::function<V1_2::Model(void)> create_model,
-             std::function<bool(int)> is_ignored, const std::vector<MixedTypedExample>& examples) {
+             std::function<bool(int)> is_ignored, const std::vector<MixedTypedExample>& examples,
+             bool testDynamicOutputShape) {
     V1_2::Model model = create_model();
 
     // see if service can handle model
@@ -412,9 +428,11 @@
     ASSERT_NE(nullptr, preparedModel.get());
 
     EvaluatePreparedModel(preparedModel, is_ignored, examples,
-                          model.relaxComputationFloat32toFloat16, Synchronously::NO);
+                          model.relaxComputationFloat32toFloat16, Synchronously::NO,
+                          testDynamicOutputShape);
     EvaluatePreparedModel(preparedModel, is_ignored, examples,
-                          model.relaxComputationFloat32toFloat16, Synchronously::YES);
+                          model.relaxComputationFloat32toFloat16, Synchronously::YES,
+                          testDynamicOutputShape);
 }
 
 }  // namespace generated_tests
diff --git a/neuralnetworks/1.2/IDevice.hal b/neuralnetworks/1.2/IDevice.hal
index 6a77961..6c3b483 100644
--- a/neuralnetworks/1.2/IDevice.hal
+++ b/neuralnetworks/1.2/IDevice.hal
@@ -56,6 +56,26 @@
     getVersionString() generates (ErrorStatus status, string version);
 
     /**
+     * Get the type of a given device.
+     *
+     * The device type can be used to help application developers to distribute
+     * Machine Learning workloads and other workloads such as graphical rendering.
+     * E.g., for an app which renders AR scenes based on real time object detection
+     * results, the developer could choose an ACCELERATOR type device for ML
+     * workloads, and reserve GPU for graphical rendering.
+     *
+     * @param status Error status returned from querying the device type. Must be:
+     *               - NONE if the query was successful
+     *               - DEVICE_UNAVAILABLE if driver is offline or busy
+     *               - GENERAL_FAILURE if the query resulted in an
+     *                 unspecified error
+     * @param type The DeviceType of the device. Please note, this is not a
+     *             bitfield of DeviceTypes. Each device must only be of a
+     *             single DeviceType.
+     */
+    getType() generates (ErrorStatus status, DeviceType type);
+
+    /**
      * Gets the supported operations in a model.
      *
      * getSupportedOperations indicates which operations of a model are fully
diff --git a/neuralnetworks/1.2/types.hal b/neuralnetworks/1.2/types.hal
index b072793..ac944c8 100644
--- a/neuralnetworks/1.2/types.hal
+++ b/neuralnetworks/1.2/types.hal
@@ -76,6 +76,18 @@
      * where C is an index in the Channel dimension.
      */
     TENSOR_QUANT8_SYMM_PER_CHANNEL = 11,
+    /**
+     * A tensor of 16 bit unsigned integers that represent real numbers.
+     *
+     * Attached to this tensor are two numbers that can be used to convert the
+     * 16 bit integer to the real value and vice versa. These two numbers are:
+     * - scale: a 32 bit floating point value greater than zero.
+     * - zeroPoint: a 32 bit integer, in range [0, 65535].
+     *
+     * The formula is:
+     * real_value = (integer_value - zeroPoint) * scale.
+     */
+    TENSOR_QUANT16_ASYMM = 12,
     /* ADDING A NEW FUNDAMENTAL TYPE REQUIRES UPDATING THE VALUE OF
      * OperandTypeRange::OPERAND_FUNDAMENTAL_MAX.
      */
@@ -89,7 +101,7 @@
  */
 enum OperandTypeRange : uint32_t {
     OPERAND_FUNDAMENTAL_MIN = 0,
-    OPERAND_FUNDAMENTAL_MAX = 11,
+    OPERAND_FUNDAMENTAL_MAX = 12,
     OPERAND_OEM_MIN     = 10000,
     OPERAND_OEM_MAX     = 10001,
 };
@@ -180,6 +192,26 @@
 };
 
 /**
+ * Device types.
+ *
+ * The type of NNAPI device.
+ */
+enum DeviceType : int32_t {
+    // Leaving 0 unused as it means unknown type in NDK NNAPI. There is no
+    // HAL equivalent of unknown type and a 1.2 HAL implementation must belong
+    // to one of the categories below.
+    /** The device does not fall into any category below. */
+    OTHER             = 1,
+    /** The device runs NNAPI models on single or multi-core CPU. */
+    CPU               = 2,
+    /** The device can run NNAPI models and also accelerate graphics APIs such
+      * as OpenGL ES and Vulkan. */
+    GPU               = 3,
+    /** Dedicated accelerator for Machine Learning workloads. */
+    ACCELERATOR       = 4,
+};
+
+/**
  * Describes one operation of the model's graph.
  */
 struct Operation {
diff --git a/neuralnetworks/1.2/vts/functional/Android.bp b/neuralnetworks/1.2/vts/functional/Android.bp
index 5b119ee..0cb9e16 100644
--- a/neuralnetworks/1.2/vts/functional/Android.bp
+++ b/neuralnetworks/1.2/vts/functional/Android.bp
@@ -21,6 +21,9 @@
     srcs: [
         "GeneratedTestsV1_0.cpp",
     ],
+    cflags: [
+        "-DNN_TEST_DYNAMIC_OUTPUT_SHAPE"
+    ],
     test_suites: ["general-tests"],
 }
 
@@ -31,6 +34,9 @@
     srcs: [
         "GeneratedTestsV1_1.cpp",
     ],
+    cflags: [
+        "-DNN_TEST_DYNAMIC_OUTPUT_SHAPE"
+    ],
     test_suites: ["general-tests"],
 }
 
@@ -42,5 +48,8 @@
         "BasicTests.cpp",
         "GeneratedTests.cpp",
     ],
+    cflags: [
+        "-DNN_TEST_DYNAMIC_OUTPUT_SHAPE"
+    ],
     test_suites: ["general-tests"],
 }
diff --git a/neuralnetworks/1.2/vts/functional/BasicTests.cpp b/neuralnetworks/1.2/vts/functional/BasicTests.cpp
index eb3ebd3..8c3ad15 100644
--- a/neuralnetworks/1.2/vts/functional/BasicTests.cpp
+++ b/neuralnetworks/1.2/vts/functional/BasicTests.cpp
@@ -45,6 +45,16 @@
     });
     EXPECT_TRUE(ret.isOk());
 }
+
+// device type test
+TEST_F(NeuralnetworksHidlTest, GetDeviceTypeTest) {
+    Return<void> ret = device->getType([](ErrorStatus status, DeviceType type) {
+        EXPECT_EQ(ErrorStatus::NONE, status);
+        EXPECT_TRUE(type == DeviceType::OTHER || type == DeviceType::CPU ||
+                    type == DeviceType::GPU || type == DeviceType::ACCELERATOR);
+    });
+    EXPECT_TRUE(ret.isOk());
+}
 }  // namespace functional
 }  // namespace vts
 }  // namespace V1_2
diff --git a/neuralnetworks/1.2/vts/functional/GeneratedTests.cpp b/neuralnetworks/1.2/vts/functional/GeneratedTests.cpp
index 9bff09c..4bc891f 100644
--- a/neuralnetworks/1.2/vts/functional/GeneratedTests.cpp
+++ b/neuralnetworks/1.2/vts/functional/GeneratedTests.cpp
@@ -33,7 +33,8 @@
 namespace generated_tests {
 using ::test_helper::MixedTypedExample;
 extern void Execute(const sp<V1_2::IDevice>&, std::function<V1_2::Model(void)>,
-                    std::function<bool(int)>, const std::vector<MixedTypedExample>&);
+                    std::function<bool(int)>, const std::vector<MixedTypedExample>&,
+                    bool testDynamicOutputShape = false);
 }  // namespace generated_tests
 
 namespace V1_2 {
diff --git a/neuralnetworks/1.2/vts/functional/GeneratedTestsV1_0.cpp b/neuralnetworks/1.2/vts/functional/GeneratedTestsV1_0.cpp
index 56a61d4..956926a 100644
--- a/neuralnetworks/1.2/vts/functional/GeneratedTestsV1_0.cpp
+++ b/neuralnetworks/1.2/vts/functional/GeneratedTestsV1_0.cpp
@@ -33,7 +33,8 @@
 namespace generated_tests {
 using ::test_helper::MixedTypedExample;
 extern void Execute(const sp<V1_2::IDevice>&, std::function<V1_2::Model(void)>,
-                    std::function<bool(int)>, const std::vector<MixedTypedExample>&);
+                    std::function<bool(int)>, const std::vector<MixedTypedExample>&,
+                    bool testDynamicOutputShape = false);
 }  // namespace generated_tests
 
 namespace V1_2 {
diff --git a/neuralnetworks/1.2/vts/functional/GeneratedTestsV1_1.cpp b/neuralnetworks/1.2/vts/functional/GeneratedTestsV1_1.cpp
index 1c781ec..425690f 100644
--- a/neuralnetworks/1.2/vts/functional/GeneratedTestsV1_1.cpp
+++ b/neuralnetworks/1.2/vts/functional/GeneratedTestsV1_1.cpp
@@ -33,7 +33,8 @@
 namespace generated_tests {
 using ::test_helper::MixedTypedExample;
 extern void Execute(const sp<V1_2::IDevice>&, std::function<V1_2::Model(void)>,
-                    std::function<bool(int)>, const std::vector<MixedTypedExample>&);
+                    std::function<bool(int)>, const std::vector<MixedTypedExample>&,
+                    bool testDynamicOutputShape = false);
 }  // namespace generated_tests
 
 namespace V1_2 {
diff --git a/neuralnetworks/1.2/vts/functional/ValidateModel.cpp b/neuralnetworks/1.2/vts/functional/ValidateModel.cpp
index b1a0e53..f3e528e 100644
--- a/neuralnetworks/1.2/vts/functional/ValidateModel.cpp
+++ b/neuralnetworks/1.2/vts/functional/ValidateModel.cpp
@@ -161,6 +161,7 @@
         case OperandType::TENSOR_FLOAT32:
         case OperandType::TENSOR_INT32:
         case OperandType::TENSOR_QUANT8_ASYMM:
+        case OperandType::TENSOR_QUANT16_ASYMM:
         case OperandType::TENSOR_QUANT16_SYMM:
         case OperandType::TENSOR_QUANT8_SYMM_PER_CHANNEL:
             return 0;
@@ -172,6 +173,9 @@
 static void mutateOperandRankTest(const sp<IDevice>& device, const Model& model) {
     for (size_t operand = 0; operand < model.operands.size(); ++operand) {
         const uint32_t invalidRank = getInvalidRank(model.operands[operand].type);
+        if (invalidRank == 0) {
+            continue;
+        }
         const std::string message = "mutateOperandRankTest: operand " + std::to_string(operand) +
                                     " has rank of " + std::to_string(invalidRank);
         validate(device, message, model, [operand, invalidRank](Model* model) {
@@ -196,6 +200,7 @@
         case OperandType::TENSOR_INT32:
             return -1.0f;
         case OperandType::TENSOR_QUANT8_ASYMM:
+        case OperandType::TENSOR_QUANT16_ASYMM:
         case OperandType::TENSOR_QUANT16_SYMM:
             return 0.0f;
         default:
@@ -230,6 +235,8 @@
             return {1};
         case OperandType::TENSOR_QUANT8_ASYMM:
             return {-1, 256};
+        case OperandType::TENSOR_QUANT16_ASYMM:
+            return {-1, 65536};
         case OperandType::TENSOR_QUANT16_SYMM:
             return {-32769, -1, 1, 32768};
         default:
@@ -285,6 +292,7 @@
             newOperand.zeroPoint = 0;
             break;
         case OperandType::TENSOR_QUANT8_ASYMM:
+        case OperandType::TENSOR_QUANT16_ASYMM:
         case OperandType::TENSOR_QUANT16_SYMM:
             newOperand.dimensions =
                 operand->dimensions.size() > 0 ? operand->dimensions : hidl_vec<uint32_t>({1});
@@ -328,6 +336,8 @@
         // - RANDOM_MULTINOMIAL's argument can be either TENSOR_FLOAT16 or TENSOR_FLOAT32.
         // - CONV_2D filter type (arg 1) can be QUANT8_ASYMM or QUANT8_SYMM_PER_CHANNEL
         // - DEPTHWISE_CONV_2D filter type (arg 1) can be QUANT8_ASYMM or QUANT8_SYMM_PER_CHANNEL
+        // - GROUPED_CONV_2D filter type (arg 1) can be QUANT8_ASYMM or QUANT8_SYMM_PER_CHANNEL
+        // - TRANSPOSE_CONV_2D filter type (arg 1) can be QUANT8_ASYMM or QUANT8_SYMM_PER_CHANNEL
         switch (operation.type) {
             case OperationType::LSH_PROJECTION: {
                 if (operand == operation.inputs[1]) {
@@ -347,6 +357,8 @@
                     return true;
                 }
             } break;
+            case OperationType::TRANSPOSE_CONV_2D:
+            case OperationType::GROUPED_CONV_2D:
             case OperationType::DEPTHWISE_CONV_2D:
             case OperationType::CONV_2D: {
                 if (operand == 1 && (type == OperandType::TENSOR_QUANT8_ASYMM ||
diff --git a/neuralnetworks/1.2/vts/functional/VtsHalNeuralnetworks.h b/neuralnetworks/1.2/vts/functional/VtsHalNeuralnetworks.h
index dedab8d..c0c21bd 100644
--- a/neuralnetworks/1.2/vts/functional/VtsHalNeuralnetworks.h
+++ b/neuralnetworks/1.2/vts/functional/VtsHalNeuralnetworks.h
@@ -79,6 +79,9 @@
 // Tag for the generated tests
 class GeneratedTest : public NeuralnetworksHidlTest {};
 
+// Tag for the dynamic output shape tests
+class DynamicOutputShapeTest : public NeuralnetworksHidlTest {};
+
 // Utility function to get PreparedModel from callback and downcast to V1_2.
 sp<IPreparedModel> getPreparedModel_1_2(
     const sp<V1_2::implementation::PreparedModelCallback>& callback);
diff --git a/power/stats/1.0/default/Android.bp b/power/stats/1.0/default/Android.bp
index 04270c1..b57466d 100644
--- a/power/stats/1.0/default/Android.bp
+++ b/power/stats/1.0/default/Android.bp
@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 
-cc_library_shared {
+cc_binary {
     name: "android.hardware.power.stats@1.0-service",
     relative_install_path: "hw",
     init_rc: ["android.hardware.power.stats@1.0-service.rc"],
diff --git a/power/stats/1.0/default/OWNERS b/power/stats/1.0/default/OWNERS
new file mode 100644
index 0000000..2d95a97
--- /dev/null
+++ b/power/stats/1.0/default/OWNERS
@@ -0,0 +1,3 @@
+krossmo@google.com
+bsschwar@google.com
+tstrudel@google.com
diff --git a/power/stats/1.0/default/PowerStats.cpp b/power/stats/1.0/default/PowerStats.cpp
index 810c575..350aa62 100644
--- a/power/stats/1.0/default/PowerStats.cpp
+++ b/power/stats/1.0/default/PowerStats.cpp
@@ -287,25 +287,218 @@
     return Void();
 }
 
+uint32_t PowerStats::addPowerEntity(const std::string& name, PowerEntityType type) {
+    uint32_t id = mPowerEntityInfos.size();
+    mPowerEntityInfos.push_back({id, name, type});
+    return id;
+}
+
+void PowerStats::addStateResidencyDataProvider(std::shared_ptr<IStateResidencyDataProvider> p) {
+    std::vector<PowerEntityStateSpace> stateSpaces = p->getStateSpaces();
+    for (auto stateSpace : stateSpaces) {
+        mPowerEntityStateSpaces.emplace(stateSpace.powerEntityId, stateSpace);
+        mStateResidencyDataProviders.emplace(stateSpace.powerEntityId, p);
+    }
+}
+
 Return<void> PowerStats::getPowerEntityInfo(getPowerEntityInfo_cb _hidl_cb) {
-    hidl_vec<PowerEntityInfo> eInfo;
-    _hidl_cb(eInfo, Status::NOT_SUPPORTED);
+    // If not configured, return NOT_SUPPORTED
+    if (mPowerEntityInfos.empty()) {
+        _hidl_cb({}, Status::NOT_SUPPORTED);
+        return Void();
+    }
+
+    _hidl_cb(mPowerEntityInfos, Status::SUCCESS);
     return Void();
 }
 
 Return<void> PowerStats::getPowerEntityStateInfo(const hidl_vec<uint32_t>& powerEntityIds,
                                                  getPowerEntityStateInfo_cb _hidl_cb) {
-    (void)powerEntityIds;
-    hidl_vec<PowerEntityStateSpace> powerEntityStateSpaces;
-    _hidl_cb(powerEntityStateSpaces, Status::NOT_SUPPORTED);
+    // If not configured, return NOT_SUPPORTED
+    if (mPowerEntityStateSpaces.empty()) {
+        _hidl_cb({}, Status::NOT_SUPPORTED);
+        return Void();
+    }
+
+    std::vector<PowerEntityStateSpace> stateSpaces;
+
+    // If powerEntityIds is empty then return state space info for all entities
+    if (powerEntityIds.size() == 0) {
+        stateSpaces.reserve(mPowerEntityStateSpaces.size());
+        for (auto i : mPowerEntityStateSpaces) {
+            stateSpaces.emplace_back(i.second);
+        }
+        _hidl_cb(stateSpaces, Status::SUCCESS);
+        return Void();
+    }
+
+    // Return state space information only for valid ids
+    auto ret = Status::SUCCESS;
+    stateSpaces.reserve(powerEntityIds.size());
+    for (const uint32_t id : powerEntityIds) {
+        auto stateSpace = mPowerEntityStateSpaces.find(id);
+        if (stateSpace != mPowerEntityStateSpaces.end()) {
+            stateSpaces.emplace_back(stateSpace->second);
+        } else {
+            ret = Status::INVALID_INPUT;
+        }
+    }
+
+    _hidl_cb(stateSpaces, ret);
     return Void();
 }
 
 Return<void> PowerStats::getPowerEntityStateResidencyData(
-    const hidl_vec<uint32_t>& powerEntityIds, getPowerEntityStateResidencyData_cb _hidl_cb) {
-    (void)powerEntityIds;
+        const hidl_vec<uint32_t>& powerEntityIds, getPowerEntityStateResidencyData_cb _hidl_cb) {
+    // If not configured, return NOT_SUPPORTED
+    if (mStateResidencyDataProviders.empty() || mPowerEntityStateSpaces.empty()) {
+        _hidl_cb({}, Status::NOT_SUPPORTED);
+        return Void();
+    }
+
+    // If powerEntityIds is empty then return data for all supported entities
+    if (powerEntityIds.size() == 0) {
+        std::vector<uint32_t> ids;
+        for (auto stateSpace : mPowerEntityStateSpaces) {
+            ids.emplace_back(stateSpace.first);
+        }
+        return getPowerEntityStateResidencyData(ids, _hidl_cb);
+    }
+
+    std::unordered_map<uint32_t, PowerEntityStateResidencyResult> stateResidencies;
+    std::vector<PowerEntityStateResidencyResult> results;
+    results.reserve(powerEntityIds.size());
+
+    // return results for only the given powerEntityIds
+    bool invalidInput = false;
+    bool filesystemError = false;
+    for (auto id : powerEntityIds) {
+        auto dataProvider = mStateResidencyDataProviders.find(id);
+        // skip if the given powerEntityId does not have an associated StateResidencyDataProvider
+        if (dataProvider == mStateResidencyDataProviders.end()) {
+            invalidInput = true;
+            continue;
+        }
+
+        // get the results if we have not already done so.
+        if (stateResidencies.find(id) == stateResidencies.end()) {
+            if (!dataProvider->second->getResults(stateResidencies)) {
+                filesystemError = true;
+            }
+        }
+
+        // append results
+        auto stateResidency = stateResidencies.find(id);
+        if (stateResidency != stateResidencies.end()) {
+            results.emplace_back(stateResidency->second);
+        }
+    }
+
+    auto ret = Status::SUCCESS;
+    if (filesystemError) {
+        ret = Status::FILESYSTEM_ERROR;
+    } else if (invalidInput) {
+        ret = Status::INVALID_INPUT;
+    }
+
+    _hidl_cb(results, ret);
+    return Void();
+}
+
+bool DumpResidencyDataToFd(const hidl_vec<PowerEntityInfo>& infos,
+                           const hidl_vec<PowerEntityStateSpace>& stateSpaces,
+                           const hidl_vec<PowerEntityStateResidencyResult>& results, int fd) {
+    // construct lookup table of powerEntityId to name
+    std::unordered_map<uint32_t, std::string> entityNames;
+    for (auto info : infos) {
+        entityNames.emplace(info.powerEntityId, info.powerEntityName);
+    }
+
+    // construct lookup table of powerEntityId, powerEntityStateId to state name
+    std::unordered_map<uint32_t, std::unordered_map<uint32_t, std::string>> stateNames;
+    for (auto stateSpace : stateSpaces) {
+        stateNames.emplace(stateSpace.powerEntityId, std::unordered_map<uint32_t, std::string>());
+        for (auto state : stateSpace.states) {
+            stateNames.at(stateSpace.powerEntityId)
+                    .emplace(state.powerEntityStateId, state.powerEntityStateName);
+        }
+    }
+
+    std::ostringstream dumpStats;
+    dumpStats << "\n========== PowerStats HAL 1.0 state residencies ==========\n";
+
+    const char* headerFormat = "  %14s   %14s   %16s   %15s   %16s\n";
+    const char* dataFormat =
+            "  %14s   %14s   %13" PRIu64 " ms   %15" PRIu64 "   %13" PRIu64 " ms\n";
+    dumpStats << android::base::StringPrintf(headerFormat, "Entity", "State", "Total time",
+                                             "Total entries", "Last entry timestamp");
+
+    for (auto result : results) {
+        for (auto stateResidency : result.stateResidencyData) {
+            dumpStats << android::base::StringPrintf(
+                    dataFormat, entityNames.at(result.powerEntityId).c_str(),
+                    stateNames.at(result.powerEntityId)
+                            .at(stateResidency.powerEntityStateId)
+                            .c_str(),
+                    stateResidency.totalTimeInStateMs, stateResidency.totalStateEntryCount,
+                    stateResidency.lastEntryTimestampMs);
+        }
+    }
+
+    dumpStats << "========== End of PowerStats HAL 1.0 state residencies ==========\n";
+
+    return android::base::WriteStringToFd(dumpStats.str(), fd);
+}
+
+Return<void> PowerStats::debug(const hidl_handle& handle, const hidl_vec<hidl_string>&) {
+    if (handle == nullptr || handle->numFds < 1) {
+        return Void();
+    }
+
+    int fd = handle->data[0];
+    Status status;
+    hidl_vec<PowerEntityInfo> infos;
+
+    // Get power entity information
+    getPowerEntityInfo([&status, &infos](auto rInfos, auto rStatus) {
+        status = rStatus;
+        infos = rInfos;
+    });
+    if (status != Status::SUCCESS) {
+        LOG(ERROR) << "Error getting power entity info";
+        return Void();
+    }
+
+    // Get power entity state information
+    hidl_vec<PowerEntityStateSpace> stateSpaces;
+    getPowerEntityStateInfo({}, [&status, &stateSpaces](auto rStateSpaces, auto rStatus) {
+        status = rStatus;
+        stateSpaces = rStateSpaces;
+    });
+    if (status != Status::SUCCESS) {
+        LOG(ERROR) << "Error getting state info";
+        return Void();
+    }
+
+    // Get power entity state residency data
     hidl_vec<PowerEntityStateResidencyResult> results;
-    _hidl_cb(results, Status::NOT_SUPPORTED);
+    getPowerEntityStateResidencyData({}, [&status, &results](auto rResults, auto rStatus) {
+        status = rStatus;
+        results = rResults;
+    });
+
+    // This implementation of getPowerEntityStateResidencyData supports the
+    // return of partial results if status == FILESYSTEM_ERROR.
+    if (status != Status::SUCCESS) {
+        LOG(ERROR) << "Error getting residency data -- Some results missing";
+    }
+
+    if (!DumpResidencyDataToFd(infos, stateSpaces, results, fd)) {
+        PLOG(ERROR) << "Failed to dump residency data to fd";
+    }
+
+    fsync(fd);
+
     return Void();
 }
 
diff --git a/power/stats/1.0/default/PowerStats.h b/power/stats/1.0/default/PowerStats.h
index fb2c6a8..d67fb35 100644
--- a/power/stats/1.0/default/PowerStats.h
+++ b/power/stats/1.0/default/PowerStats.h
@@ -21,6 +21,7 @@
 #include <fmq/MessageQueue.h>
 #include <hidl/MQDescriptor.h>
 #include <hidl/Status.h>
+#include <unordered_map>
 
 namespace android {
 namespace hardware {
@@ -60,8 +61,19 @@
     std::unique_ptr<MessageQueueSync> fmqSynchronized;
 };
 
+class IStateResidencyDataProvider {
+   public:
+    virtual ~IStateResidencyDataProvider() = default;
+    virtual bool getResults(
+            std::unordered_map<uint32_t, PowerEntityStateResidencyResult>& results) = 0;
+    virtual std::vector<PowerEntityStateSpace> getStateSpaces() = 0;
+};
+
 struct PowerStats : public IPowerStats {
+   public:
     PowerStats();
+    uint32_t addPowerEntity(const std::string& name, PowerEntityType type);
+    void addStateResidencyDataProvider(std::shared_ptr<IStateResidencyDataProvider> p);
     // Methods from ::android::hardware::power::stats::V1_0::IPowerStats follow.
     Return<void> getRailInfo(getRailInfo_cb _hidl_cb) override;
     Return<void> getEnergyData(const hidl_vec<uint32_t>& railIndices,
@@ -75,12 +87,19 @@
         const hidl_vec<uint32_t>& powerEntityIds,
         getPowerEntityStateResidencyData_cb _hidl_cb) override;
 
+    // Methods from ::android::hidl::base::V1_0::IBase follow.
+    Return<void> debug(const hidl_handle& fd, const hidl_vec<hidl_string>& args) override;
+
    private:
     OnDeviceMmt mPm;
     void findIioPowerMonitorNodes();
     size_t parsePowerRails();
     int parseIioEnergyNode(std::string devName);
     Status parseIioEnergyNodes();
+    std::vector<PowerEntityInfo> mPowerEntityInfos;
+    std::unordered_map<uint32_t, PowerEntityStateSpace> mPowerEntityStateSpaces;
+    std::unordered_map<uint32_t, std::shared_ptr<IStateResidencyDataProvider>>
+            mStateResidencyDataProviders;
 };
 
 }  // namespace implementation
diff --git a/power/stats/1.0/default/service.cpp b/power/stats/1.0/default/service.cpp
index 80649f5..a516536 100644
--- a/power/stats/1.0/default/service.cpp
+++ b/power/stats/1.0/default/service.cpp
@@ -31,17 +31,69 @@
 
 // Generated HIDL files
 using android::hardware::power::stats::V1_0::IPowerStats;
+using android::hardware::power::stats::V1_0::PowerEntityStateResidencyResult;
+using android::hardware::power::stats::V1_0::PowerEntityStateSpace;
+using android::hardware::power::stats::V1_0::PowerEntityType;
+using android::hardware::power::stats::V1_0::implementation::IStateResidencyDataProvider;
 using android::hardware::power::stats::V1_0::implementation::PowerStats;
 
+class DefaultStateResidencyDataProvider : public IStateResidencyDataProvider {
+   public:
+    DefaultStateResidencyDataProvider(uint32_t id)
+        : mPowerEntityId(id), mActiveStateId(0), mSleepStateId(1) {}
+    ~DefaultStateResidencyDataProvider() = default;
+
+    bool getResults(std::unordered_map<uint32_t, PowerEntityStateResidencyResult>& results) {
+        PowerEntityStateResidencyResult result = { .powerEntityId = mPowerEntityId };
+        result.stateResidencyData.resize(2);
+
+        // Using fake numbers here for display only. A real implementation would
+        // use actual tracked stats.
+        result.stateResidencyData[0] = {
+            .powerEntityStateId = mActiveStateId,
+            .totalTimeInStateMs = 1,
+            .totalStateEntryCount = 2,
+            .lastEntryTimestampMs = 3
+        };
+        result.stateResidencyData[1] = {
+            .powerEntityStateId = mSleepStateId,
+            .totalTimeInStateMs = 4,
+            .totalStateEntryCount = 5,
+            .lastEntryTimestampMs = 6,
+        };
+        results.emplace(mPowerEntityId, result);
+        return true;
+    }
+
+    std::vector<PowerEntityStateSpace> getStateSpaces() {
+        return {{
+          .powerEntityId = mPowerEntityId,
+          .states = {
+              {.powerEntityStateId = mActiveStateId, .powerEntityStateName = "Active"},
+              {.powerEntityStateId = mSleepStateId, .powerEntityStateName = "Sleep"}
+          }
+        }};
+    }
+
+   private:
+    const uint32_t mPowerEntityId;
+    const uint32_t mActiveStateId;
+    const uint32_t mSleepStateId;
+};
+
 int main(int /* argc */, char** /* argv */) {
     ALOGI("power.stats service 1.0 is starting.");
 
-    android::sp<IPowerStats> service = new PowerStats();
+    PowerStats* service = new PowerStats();
     if (service == nullptr) {
         ALOGE("Can not create an instance of power.stats HAL Iface, exiting.");
         return 1;
     }
 
+    uint32_t defaultId = service->addPowerEntity("DefaultEntity", PowerEntityType::SUBSYSTEM);
+    auto defaultSdp = std::make_shared<DefaultStateResidencyDataProvider>(defaultId);
+    service->addStateResidencyDataProvider(std::move(defaultSdp));
+
     configureRpcThreadpool(1, true /*callerWillJoin*/);
 
     status_t status = service->registerAsService();
diff --git a/radio/1.3/IRadio.hal b/radio/1.3/IRadio.hal
index 2d64381..cc5b860 100644
--- a/radio/1.3/IRadio.hal
+++ b/radio/1.3/IRadio.hal
@@ -60,4 +60,15 @@
     * Response function is IRadioResponse.enableModemResponse()
     */
     oneway enableModem(int32_t serial, bool on);
-};
+
+   /**
+    * Request status of logical modem associated with the given serial number. It returns
+    * isEnabled=true if the logical modem is in low power mode without any activity, while
+    * the SIM card remains visible.
+    *
+    * @param serial Serial number of request.
+    *
+    * Response function is IRadioResponse.getModemStackStatusResponse()
+    */
+    oneway getModemStackStatus(int32_t serial);
+};
\ No newline at end of file
diff --git a/radio/1.3/IRadioResponse.hal b/radio/1.3/IRadioResponse.hal
index abdf2ee..c3bbe65 100644
--- a/radio/1.3/IRadioResponse.hal
+++ b/radio/1.3/IRadioResponse.hal
@@ -43,7 +43,17 @@
      * Valid errors returned:
      *   RadioError:NONE
      *   RadioError:RADIO_NOT_AVAILABLE
-     *   RadioError:INTERNAL_ERR
+     *   RadioError:MODEM_ERR
      */
     oneway enableModemResponse(RadioResponseInfo info);
+
+    /**
+     * @param info Response info struct containing response type, serial no. and error
+     *
+     * Valid errors returned:
+     *   RadioError:NONE
+     *   RadioError:RADIO_NOT_AVAILABLE
+     *   RadioError:MODEM_ERR
+     */
+    oneway getModemStackStatusResponse(RadioResponseInfo info, bool isEnabled);
 };
diff --git a/radio/1.3/types.hal b/radio/1.3/types.hal
new file mode 100644
index 0000000..aa16cc7
--- /dev/null
+++ b/radio/1.3/types.hal
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.hardware.radio@1.3;
+
+import @1.0::RadioResponseType;
+import @1.0::RadioError;
+
+struct RadioResponseInfoModem {
+    RadioResponseType type;               // Response type
+    int32_t serial;                       // Serial number of the request
+    RadioError error;                     // Response error
+    bool isEnabled;                       // whether modem is enabled or not
+};
\ No newline at end of file
diff --git a/radio/1.3/vts/OWNERS b/radio/1.3/vts/OWNERS
new file mode 100644
index 0000000..d642064
--- /dev/null
+++ b/radio/1.3/vts/OWNERS
@@ -0,0 +1,10 @@
+# Telephony team
+amitmahajan@google.com
+sanketpadawe@google.com
+shuoq@google.com
+sasindran@google.com
+nazaninb@google.com
+
+# VTS team
+yuexima@google.com
+yim@google.com
diff --git a/radio/1.3/vts/functional/Android.bp b/radio/1.3/vts/functional/Android.bp
new file mode 100644
index 0000000..67aff6e
--- /dev/null
+++ b/radio/1.3/vts/functional/Android.bp
@@ -0,0 +1,36 @@
+//
+// Copyright (C) 2019 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+cc_test {
+    name: "VtsHalRadioV1_3TargetTest",
+    defaults: ["VtsHalTargetTestDefaults"],
+    srcs: [
+        "radio_hidl_hal_api.cpp",
+        "radio_hidl_hal_test.cpp",
+        "radio_response.cpp",
+        "radio_indication.cpp",
+        "VtsHalRadioV1_3TargetTest.cpp",
+    ],
+    static_libs: [
+        "RadioVtsTestUtilBase",
+        "android.hardware.radio@1.3",
+        "android.hardware.radio@1.2",
+        "android.hardware.radio@1.1",
+        "android.hardware.radio@1.0",
+    ],
+    header_libs: ["radio.util.header@1.0"],
+    test_suites: ["general-tests"],
+}
diff --git a/radio/1.3/vts/functional/VtsHalRadioV1_3TargetTest.cpp b/radio/1.3/vts/functional/VtsHalRadioV1_3TargetTest.cpp
new file mode 100644
index 0000000..7d2623e
--- /dev/null
+++ b/radio/1.3/vts/functional/VtsHalRadioV1_3TargetTest.cpp
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <radio_hidl_hal_utils_v1_3.h>
+
+int main(int argc, char** argv) {
+    ::testing::AddGlobalTestEnvironment(RadioHidlEnvironment::Instance());
+    ::testing::InitGoogleTest(&argc, argv);
+    RadioHidlEnvironment::Instance()->init(&argc, argv);
+    int status = RUN_ALL_TESTS();
+    LOG(INFO) << "Test result = " << status;
+    return status;
+}
diff --git a/radio/1.3/vts/functional/radio_hidl_hal_api.cpp b/radio/1.3/vts/functional/radio_hidl_hal_api.cpp
new file mode 100644
index 0000000..6208c67
--- /dev/null
+++ b/radio/1.3/vts/functional/radio_hidl_hal_api.cpp
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <radio_hidl_hal_utils_v1_3.h>
+#include <vector>
+
+#define ASSERT_OK(ret) ASSERT_TRUE(ret.isOk())
+
+/*
+ * Test IRadio.enableMddem() for the response returned.
+ */
+TEST_F(RadioHidlTest_v1_3, enableModem) {
+    serial = GetRandomSerialNumber();
+
+    bool responseToggle = radioRsp_v1_3->enableModemResponseToggle;
+    Return<void> res = radio_v1_3->enableModem(serial, true);
+    ASSERT_OK(res);
+    EXPECT_EQ(std::cv_status::no_timeout, wait());
+    EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_3->rspInfo.type);
+    EXPECT_EQ(serial, radioRsp_v1_3->rspInfo.serial);
+    ALOGI("getModemStackStatus, rspInfo.error = %s\n",
+          toString(radioRsp_v1_3->rspInfo.error).c_str());
+    ASSERT_TRUE(CheckAnyOfErrors(
+            radioRsp_v1_3->rspInfo.error,
+            {RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE, RadioError::MODEM_ERR}));
+
+    // checking if getModemStackStatus returns true, as modem was enabled above
+    if (RadioError::NONE == radioRsp_v1_3->rspInfo.error) {
+        // wait until modem enabling is finished
+        while (responseToggle == radioRsp_v1_3->enableModemResponseToggle) {
+            sleep(1);
+        }
+        Return<void> resEnabled = radio_v1_3->getModemStackStatus(serial);
+        ASSERT_OK(resEnabled);
+        EXPECT_EQ(std::cv_status::no_timeout, wait());
+        EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_3->rspInfo.type);
+        EXPECT_EQ(serial, radioRsp_v1_3->rspInfo.serial);
+        ALOGI("getModemStackStatus, rspInfo.error = %s\n",
+              toString(radioRsp_v1_3->rspInfo.error).c_str());
+        ASSERT_TRUE(CheckAnyOfErrors(
+                radioRsp_v1_3->rspInfo.error,
+                {RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE, RadioError::MODEM_ERR}));
+        // verify that enableModem did set isEnabled correctly
+        EXPECT_EQ(true, radioRsp_v1_3->isModemEnabled);
+    }
+}
+
+/*
+ * Test IRadio.getModemStackStatus() for the response returned.
+ */
+TEST_F(RadioHidlTest_v1_3, getModemStackStatus) {
+    serial = GetRandomSerialNumber();
+
+    Return<void> res = radio_v1_3->getModemStackStatus(serial);
+    ASSERT_OK(res);
+    EXPECT_EQ(std::cv_status::no_timeout, wait());
+    EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_3->rspInfo.type);
+    EXPECT_EQ(serial, radioRsp_v1_3->rspInfo.serial);
+    ALOGI("getModemStackStatus, rspInfo.error = %s\n",
+          toString(radioRsp_v1_3->rspInfo.error).c_str());
+    ASSERT_TRUE(CheckAnyOfErrors(
+            radioRsp_v1_3->rspInfo.error,
+            {RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE, RadioError::MODEM_ERR}));
+}
diff --git a/radio/1.3/vts/functional/radio_hidl_hal_test.cpp b/radio/1.3/vts/functional/radio_hidl_hal_test.cpp
new file mode 100644
index 0000000..a876b1a
--- /dev/null
+++ b/radio/1.3/vts/functional/radio_hidl_hal_test.cpp
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <radio_hidl_hal_utils_v1_3.h>
+
+void RadioHidlTest_v1_3::SetUp() {
+    radio_v1_3 = ::testing::VtsHalHidlTargetTestBase::getService<
+            ::android::hardware::radio::V1_3::IRadio>(
+            RadioHidlEnvironment::Instance()
+                    ->getServiceName<::android::hardware::radio::V1_3::IRadio>(
+                            hidl_string(RADIO_SERVICE_NAME)));
+    if (radio_v1_3 == NULL) {
+        sleep(60);
+        radio_v1_3 = ::testing::VtsHalHidlTargetTestBase::getService<
+                ::android::hardware::radio::V1_3::IRadio>(
+                RadioHidlEnvironment::Instance()
+                        ->getServiceName<::android::hardware::radio::V1_3::IRadio>(
+                                hidl_string(RADIO_SERVICE_NAME)));
+    }
+    ASSERT_NE(nullptr, radio_v1_3.get());
+
+    radioRsp_v1_3 = new (std::nothrow) RadioResponse_v1_3(*this);
+    ASSERT_NE(nullptr, radioRsp_v1_3.get());
+
+    count_ = 0;
+
+    radioInd_v1_3 = new (std::nothrow) RadioIndication_v1_3(*this);
+    ASSERT_NE(nullptr, radioInd_v1_3.get());
+
+    radio_v1_3->setResponseFunctions(radioRsp_v1_3, radioInd_v1_3);
+
+    updateSimCardStatus();
+    EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_3->rspInfo.type);
+    EXPECT_EQ(serial, radioRsp_v1_3->rspInfo.serial);
+    EXPECT_EQ(RadioError::NONE, radioRsp_v1_3->rspInfo.error);
+
+    /* Enforce Vts Testing with Sim Status Present only. */
+    EXPECT_EQ(CardState::PRESENT, cardStatus.base.cardState);
+}
+
+/*
+ * Notify that the response message is received.
+ */
+void RadioHidlTest_v1_3::notify(int receivedSerial) {
+    std::unique_lock<std::mutex> lock(mtx_);
+    if (serial == receivedSerial) {
+        count_++;
+        cv_.notify_one();
+    }
+}
+
+/*
+ * Wait till the response message is notified or till TIMEOUT_PERIOD.
+ */
+std::cv_status RadioHidlTest_v1_3::wait() {
+    std::unique_lock<std::mutex> lock(mtx_);
+
+    std::cv_status status = std::cv_status::no_timeout;
+    auto now = std::chrono::system_clock::now();
+    while (count_ == 0) {
+        status = cv_.wait_until(lock, now + std::chrono::seconds(TIMEOUT_PERIOD));
+        if (status == std::cv_status::timeout) {
+            return status;
+        }
+    }
+    count_--;
+    return status;
+}
+
+void RadioHidlTest_v1_3::updateSimCardStatus() {
+    serial = GetRandomSerialNumber();
+    radio_v1_3->getIccCardStatus(serial);
+    EXPECT_EQ(std::cv_status::no_timeout, wait());
+}
\ No newline at end of file
diff --git a/radio/1.3/vts/functional/radio_hidl_hal_utils_v1_3.h b/radio/1.3/vts/functional/radio_hidl_hal_utils_v1_3.h
new file mode 100644
index 0000000..1d03a99
--- /dev/null
+++ b/radio/1.3/vts/functional/radio_hidl_hal_utils_v1_3.h
@@ -0,0 +1,658 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <android-base/logging.h>
+
+#include <VtsHalHidlTargetTestBase.h>
+#include <VtsHalHidlTargetTestEnvBase.h>
+#include <chrono>
+#include <condition_variable>
+#include <mutex>
+
+#include <android/hardware/radio/1.2/types.h>
+#include <android/hardware/radio/1.3/IRadio.h>
+#include <android/hardware/radio/1.3/IRadioIndication.h>
+#include <android/hardware/radio/1.3/IRadioResponse.h>
+
+#include "vts_test_util.h"
+
+using namespace ::android::hardware::radio::V1_3;
+using namespace ::android::hardware::radio::V1_2;
+using namespace ::android::hardware::radio::V1_1;
+using namespace ::android::hardware::radio::V1_0;
+
+using ::android::sp;
+using ::android::hardware::hidl_bitfield;
+using ::android::hardware::hidl_string;
+using ::android::hardware::hidl_vec;
+using ::android::hardware::Return;
+using ::android::hardware::Void;
+
+#define TIMEOUT_PERIOD 75
+#define RADIO_SERVICE_NAME "slot1"
+
+class RadioHidlTest_v1_3;
+extern ::android::hardware::radio::V1_2::CardStatus cardStatus;
+
+/* Callback class for radio response v1_3*/
+class RadioResponse_v1_3 : public ::android::hardware::radio::V1_3::IRadioResponse {
+   protected:
+    RadioHidlTest_v1_3& parent_v1_3;
+
+   public:
+    RadioResponseInfo rspInfo;
+    // Modem
+    bool isModemEnabled;
+    bool enableModemResponseToggle = false;
+
+    // Data
+    ::android::hardware::radio::V1_2::DataRegStateResult dataRegResp;
+
+    RadioResponse_v1_3(RadioHidlTest_v1_3& parent_v1_3);
+    virtual ~RadioResponse_v1_3() = default;
+
+    Return<void> getIccCardStatusResponse(
+            const RadioResponseInfo& info,
+            const ::android::hardware::radio::V1_0::CardStatus& cardStatus);
+
+    Return<void> supplyIccPinForAppResponse(const RadioResponseInfo& info,
+                                            int32_t remainingRetries);
+
+    Return<void> supplyIccPukForAppResponse(const RadioResponseInfo& info,
+                                            int32_t remainingRetries);
+
+    Return<void> supplyIccPin2ForAppResponse(const RadioResponseInfo& info,
+                                             int32_t remainingRetries);
+
+    Return<void> supplyIccPuk2ForAppResponse(const RadioResponseInfo& info,
+                                             int32_t remainingRetries);
+
+    Return<void> changeIccPinForAppResponse(const RadioResponseInfo& info,
+                                            int32_t remainingRetries);
+
+    Return<void> changeIccPin2ForAppResponse(const RadioResponseInfo& info,
+                                             int32_t remainingRetries);
+
+    Return<void> supplyNetworkDepersonalizationResponse(const RadioResponseInfo& info,
+                                                        int32_t remainingRetries);
+
+    Return<void> getCurrentCallsResponse(
+            const RadioResponseInfo& info,
+            const ::android::hardware::hidl_vec<::android::hardware::radio::V1_0::Call>& calls);
+
+    Return<void> dialResponse(const RadioResponseInfo& info);
+
+    Return<void> getIMSIForAppResponse(const RadioResponseInfo& info,
+                                       const ::android::hardware::hidl_string& imsi);
+
+    Return<void> hangupConnectionResponse(const RadioResponseInfo& info);
+
+    Return<void> hangupWaitingOrBackgroundResponse(const RadioResponseInfo& info);
+
+    Return<void> hangupForegroundResumeBackgroundResponse(const RadioResponseInfo& info);
+
+    Return<void> switchWaitingOrHoldingAndActiveResponse(const RadioResponseInfo& info);
+
+    Return<void> conferenceResponse(const RadioResponseInfo& info);
+
+    Return<void> rejectCallResponse(const RadioResponseInfo& info);
+
+    Return<void> getLastCallFailCauseResponse(const RadioResponseInfo& info,
+                                              const LastCallFailCauseInfo& failCauseInfo);
+
+    Return<void> getSignalStrengthResponse(
+            const RadioResponseInfo& info,
+            const ::android::hardware::radio::V1_0::SignalStrength& sigStrength);
+
+    Return<void> getVoiceRegistrationStateResponse(
+            const RadioResponseInfo& info,
+            const ::android::hardware::radio::V1_0::VoiceRegStateResult& voiceRegResponse);
+
+    Return<void> getDataRegistrationStateResponse(
+            const RadioResponseInfo& info,
+            const ::android::hardware::radio::V1_0::DataRegStateResult& dataRegResponse);
+
+    Return<void> getOperatorResponse(const RadioResponseInfo& info,
+                                     const ::android::hardware::hidl_string& longName,
+                                     const ::android::hardware::hidl_string& shortName,
+                                     const ::android::hardware::hidl_string& numeric);
+
+    Return<void> setRadioPowerResponse(const RadioResponseInfo& info);
+
+    Return<void> sendDtmfResponse(const RadioResponseInfo& info);
+
+    Return<void> sendSmsResponse(const RadioResponseInfo& info, const SendSmsResult& sms);
+
+    Return<void> sendSMSExpectMoreResponse(const RadioResponseInfo& info, const SendSmsResult& sms);
+
+    Return<void> setupDataCallResponse(const RadioResponseInfo& info,
+                                       const SetupDataCallResult& dcResponse);
+
+    Return<void> iccIOForAppResponse(const RadioResponseInfo& info, const IccIoResult& iccIo);
+
+    Return<void> sendUssdResponse(const RadioResponseInfo& info);
+
+    Return<void> cancelPendingUssdResponse(const RadioResponseInfo& info);
+
+    Return<void> getClirResponse(const RadioResponseInfo& info, int32_t n, int32_t m);
+
+    Return<void> setClirResponse(const RadioResponseInfo& info);
+
+    Return<void> getCallForwardStatusResponse(
+            const RadioResponseInfo& info,
+            const ::android::hardware::hidl_vec<CallForwardInfo>& call_forwardInfos);
+
+    Return<void> setCallForwardResponse(const RadioResponseInfo& info);
+
+    Return<void> getCallWaitingResponse(const RadioResponseInfo& info, bool enable,
+                                        int32_t serviceClass);
+
+    Return<void> setCallWaitingResponse(const RadioResponseInfo& info);
+
+    Return<void> acknowledgeLastIncomingGsmSmsResponse(const RadioResponseInfo& info);
+
+    Return<void> acceptCallResponse(const RadioResponseInfo& info);
+
+    Return<void> deactivateDataCallResponse(const RadioResponseInfo& info);
+
+    Return<void> getFacilityLockForAppResponse(const RadioResponseInfo& info, int32_t response);
+
+    Return<void> setFacilityLockForAppResponse(const RadioResponseInfo& info, int32_t retry);
+
+    Return<void> setBarringPasswordResponse(const RadioResponseInfo& info);
+
+    Return<void> getNetworkSelectionModeResponse(const RadioResponseInfo& info, bool manual);
+
+    Return<void> setNetworkSelectionModeAutomaticResponse(const RadioResponseInfo& info);
+
+    Return<void> setNetworkSelectionModeManualResponse(const RadioResponseInfo& info);
+
+    Return<void> getAvailableNetworksResponse(
+            const RadioResponseInfo& info,
+            const ::android::hardware::hidl_vec<OperatorInfo>& networkInfos);
+
+    Return<void> startDtmfResponse(const RadioResponseInfo& info);
+
+    Return<void> stopDtmfResponse(const RadioResponseInfo& info);
+
+    Return<void> getBasebandVersionResponse(const RadioResponseInfo& info,
+                                            const ::android::hardware::hidl_string& version);
+
+    Return<void> separateConnectionResponse(const RadioResponseInfo& info);
+
+    Return<void> setMuteResponse(const RadioResponseInfo& info);
+
+    Return<void> getMuteResponse(const RadioResponseInfo& info, bool enable);
+
+    Return<void> getClipResponse(const RadioResponseInfo& info, ClipStatus status);
+
+    Return<void> getDataCallListResponse(
+            const RadioResponseInfo& info,
+            const ::android::hardware::hidl_vec<SetupDataCallResult>& dcResponse);
+
+    Return<void> sendOemRilRequestRawResponse(const RadioResponseInfo& info,
+                                              const ::android::hardware::hidl_vec<uint8_t>& data);
+
+    Return<void> sendOemRilRequestStringsResponse(
+            const RadioResponseInfo& info,
+            const ::android::hardware::hidl_vec<::android::hardware::hidl_string>& data);
+
+    Return<void> setSuppServiceNotificationsResponse(const RadioResponseInfo& info);
+
+    Return<void> writeSmsToSimResponse(const RadioResponseInfo& info, int32_t index);
+
+    Return<void> deleteSmsOnSimResponse(const RadioResponseInfo& info);
+
+    Return<void> setBandModeResponse(const RadioResponseInfo& info);
+
+    Return<void> getAvailableBandModesResponse(
+            const RadioResponseInfo& info,
+            const ::android::hardware::hidl_vec<RadioBandMode>& bandModes);
+
+    Return<void> sendEnvelopeResponse(const RadioResponseInfo& info,
+                                      const ::android::hardware::hidl_string& commandResponse);
+
+    Return<void> sendTerminalResponseToSimResponse(const RadioResponseInfo& info);
+
+    Return<void> handleStkCallSetupRequestFromSimResponse(const RadioResponseInfo& info);
+
+    Return<void> explicitCallTransferResponse(const RadioResponseInfo& info);
+
+    Return<void> setPreferredNetworkTypeResponse(const RadioResponseInfo& info);
+
+    Return<void> getPreferredNetworkTypeResponse(const RadioResponseInfo& info,
+                                                 PreferredNetworkType nwType);
+
+    Return<void> getNeighboringCidsResponse(
+            const RadioResponseInfo& info,
+            const ::android::hardware::hidl_vec<NeighboringCell>& cells);
+
+    Return<void> setLocationUpdatesResponse(const RadioResponseInfo& info);
+
+    Return<void> setCdmaSubscriptionSourceResponse(const RadioResponseInfo& info);
+
+    Return<void> setCdmaRoamingPreferenceResponse(const RadioResponseInfo& info);
+
+    Return<void> getCdmaRoamingPreferenceResponse(const RadioResponseInfo& info,
+                                                  CdmaRoamingType type);
+
+    Return<void> setTTYModeResponse(const RadioResponseInfo& info);
+
+    Return<void> getTTYModeResponse(const RadioResponseInfo& info, TtyMode mode);
+
+    Return<void> setPreferredVoicePrivacyResponse(const RadioResponseInfo& info);
+
+    Return<void> getPreferredVoicePrivacyResponse(const RadioResponseInfo& info, bool enable);
+
+    Return<void> sendCDMAFeatureCodeResponse(const RadioResponseInfo& info);
+
+    Return<void> sendBurstDtmfResponse(const RadioResponseInfo& info);
+
+    Return<void> sendCdmaSmsResponse(const RadioResponseInfo& info, const SendSmsResult& sms);
+
+    Return<void> acknowledgeLastIncomingCdmaSmsResponse(const RadioResponseInfo& info);
+
+    Return<void> getGsmBroadcastConfigResponse(
+            const RadioResponseInfo& info,
+            const ::android::hardware::hidl_vec<GsmBroadcastSmsConfigInfo>& configs);
+
+    Return<void> setGsmBroadcastConfigResponse(const RadioResponseInfo& info);
+
+    Return<void> setGsmBroadcastActivationResponse(const RadioResponseInfo& info);
+
+    Return<void> getCdmaBroadcastConfigResponse(
+            const RadioResponseInfo& info,
+            const ::android::hardware::hidl_vec<CdmaBroadcastSmsConfigInfo>& configs);
+
+    Return<void> setCdmaBroadcastConfigResponse(const RadioResponseInfo& info);
+
+    Return<void> setCdmaBroadcastActivationResponse(const RadioResponseInfo& info);
+
+    Return<void> getCDMASubscriptionResponse(const RadioResponseInfo& info,
+                                             const ::android::hardware::hidl_string& mdn,
+                                             const ::android::hardware::hidl_string& hSid,
+                                             const ::android::hardware::hidl_string& hNid,
+                                             const ::android::hardware::hidl_string& min,
+                                             const ::android::hardware::hidl_string& prl);
+
+    Return<void> writeSmsToRuimResponse(const RadioResponseInfo& info, uint32_t index);
+
+    Return<void> deleteSmsOnRuimResponse(const RadioResponseInfo& info);
+
+    Return<void> getDeviceIdentityResponse(const RadioResponseInfo& info,
+                                           const ::android::hardware::hidl_string& imei,
+                                           const ::android::hardware::hidl_string& imeisv,
+                                           const ::android::hardware::hidl_string& esn,
+                                           const ::android::hardware::hidl_string& meid);
+
+    Return<void> exitEmergencyCallbackModeResponse(const RadioResponseInfo& info);
+
+    Return<void> getSmscAddressResponse(const RadioResponseInfo& info,
+                                        const ::android::hardware::hidl_string& smsc);
+
+    Return<void> setSmscAddressResponse(const RadioResponseInfo& info);
+
+    Return<void> reportSmsMemoryStatusResponse(const RadioResponseInfo& info);
+
+    Return<void> reportStkServiceIsRunningResponse(const RadioResponseInfo& info);
+
+    Return<void> getCdmaSubscriptionSourceResponse(const RadioResponseInfo& info,
+                                                   CdmaSubscriptionSource source);
+
+    Return<void> requestIsimAuthenticationResponse(
+            const RadioResponseInfo& info, const ::android::hardware::hidl_string& response);
+
+    Return<void> acknowledgeIncomingGsmSmsWithPduResponse(const RadioResponseInfo& info);
+
+    Return<void> sendEnvelopeWithStatusResponse(const RadioResponseInfo& info,
+                                                const IccIoResult& iccIo);
+
+    Return<void> getVoiceRadioTechnologyResponse(const RadioResponseInfo& info,
+                                                 RadioTechnology rat);
+
+    Return<void> getCellInfoListResponse(
+            const RadioResponseInfo& info,
+            const ::android::hardware::hidl_vec<::android::hardware::radio::V1_0::CellInfo>&
+                    cellInfo);
+
+    Return<void> setCellInfoListRateResponse(const RadioResponseInfo& info);
+
+    Return<void> setInitialAttachApnResponse(const RadioResponseInfo& info);
+
+    Return<void> getImsRegistrationStateResponse(const RadioResponseInfo& info, bool isRegistered,
+                                                 RadioTechnologyFamily ratFamily);
+
+    Return<void> sendImsSmsResponse(const RadioResponseInfo& info, const SendSmsResult& sms);
+
+    Return<void> iccTransmitApduBasicChannelResponse(const RadioResponseInfo& info,
+                                                     const IccIoResult& result);
+
+    Return<void> iccOpenLogicalChannelResponse(
+            const RadioResponseInfo& info, int32_t channelId,
+            const ::android::hardware::hidl_vec<int8_t>& selectResponse);
+
+    Return<void> iccCloseLogicalChannelResponse(const RadioResponseInfo& info);
+
+    Return<void> iccTransmitApduLogicalChannelResponse(const RadioResponseInfo& info,
+                                                       const IccIoResult& result);
+
+    Return<void> nvReadItemResponse(const RadioResponseInfo& info,
+                                    const ::android::hardware::hidl_string& result);
+
+    Return<void> nvWriteItemResponse(const RadioResponseInfo& info);
+
+    Return<void> nvWriteCdmaPrlResponse(const RadioResponseInfo& info);
+
+    Return<void> nvResetConfigResponse(const RadioResponseInfo& info);
+
+    Return<void> setUiccSubscriptionResponse(const RadioResponseInfo& info);
+
+    Return<void> setDataAllowedResponse(const RadioResponseInfo& info);
+
+    Return<void> getHardwareConfigResponse(
+            const RadioResponseInfo& info,
+            const ::android::hardware::hidl_vec<HardwareConfig>& config);
+
+    Return<void> requestIccSimAuthenticationResponse(const RadioResponseInfo& info,
+                                                     const IccIoResult& result);
+
+    Return<void> setDataProfileResponse(const RadioResponseInfo& info);
+
+    Return<void> requestShutdownResponse(const RadioResponseInfo& info);
+
+    Return<void> getRadioCapabilityResponse(const RadioResponseInfo& info,
+                                            const RadioCapability& rc);
+
+    Return<void> setRadioCapabilityResponse(const RadioResponseInfo& info,
+                                            const RadioCapability& rc);
+
+    Return<void> startLceServiceResponse(const RadioResponseInfo& info,
+                                         const LceStatusInfo& statusInfo);
+
+    Return<void> stopLceServiceResponse(const RadioResponseInfo& info,
+                                        const LceStatusInfo& statusInfo);
+
+    Return<void> pullLceDataResponse(const RadioResponseInfo& info, const LceDataInfo& lceInfo);
+
+    Return<void> getModemActivityInfoResponse(const RadioResponseInfo& info,
+                                              const ActivityStatsInfo& activityInfo);
+
+    Return<void> setAllowedCarriersResponse(const RadioResponseInfo& info, int32_t numAllowed);
+
+    Return<void> getAllowedCarriersResponse(const RadioResponseInfo& info, bool allAllowed,
+                                            const CarrierRestrictions& carriers);
+
+    Return<void> sendDeviceStateResponse(const RadioResponseInfo& info);
+
+    Return<void> setIndicationFilterResponse(const RadioResponseInfo& info);
+
+    Return<void> setSimCardPowerResponse(const RadioResponseInfo& info);
+
+    Return<void> acknowledgeRequest(int32_t serial);
+
+    /* 1.1 Api */
+    Return<void> setCarrierInfoForImsiEncryptionResponse(const RadioResponseInfo& info);
+
+    Return<void> setSimCardPowerResponse_1_1(const RadioResponseInfo& info);
+
+    Return<void> startNetworkScanResponse(const RadioResponseInfo& info);
+
+    Return<void> stopNetworkScanResponse(const RadioResponseInfo& info);
+
+    Return<void> startKeepaliveResponse(const RadioResponseInfo& info,
+                                        const KeepaliveStatus& status);
+
+    Return<void> stopKeepaliveResponse(const RadioResponseInfo& info);
+
+    /* 1.2 Api */
+    Return<void> setSignalStrengthReportingCriteriaResponse(const RadioResponseInfo& info);
+
+    Return<void> setLinkCapacityReportingCriteriaResponse(const RadioResponseInfo& info);
+
+    Return<void> getIccCardStatusResponse_1_2(
+            const RadioResponseInfo& info,
+            const ::android::hardware::radio::V1_2::CardStatus& card_status);
+
+    Return<void> getCurrentCallsResponse_1_2(
+            const RadioResponseInfo& info,
+            const ::android::hardware::hidl_vec<::android::hardware::radio::V1_2::Call>& calls);
+
+    Return<void> getSignalStrengthResponse_1_2(
+            const RadioResponseInfo& info,
+            const ::android::hardware::radio::V1_2::SignalStrength& sig_strength);
+
+    Return<void> getCellInfoListResponse_1_2(
+            const RadioResponseInfo& info,
+            const ::android::hardware::hidl_vec<::android::hardware::radio::V1_2::CellInfo>&
+                    cellInfo);
+
+    Return<void> getVoiceRegistrationStateResponse_1_2(
+            const RadioResponseInfo& info,
+            const ::android::hardware::radio::V1_2::VoiceRegStateResult& voiceRegResponse);
+
+    Return<void> getDataRegistrationStateResponse_1_2(
+            const RadioResponseInfo& info,
+            const ::android::hardware::radio::V1_2::DataRegStateResult& dataRegResponse);
+
+    /* 1.3 Api */
+    Return<void> setSystemSelectionChannelsResponse(const RadioResponseInfo& info);
+
+    Return<void> enableModemResponse(const RadioResponseInfo& info);
+
+    Return<void> getModemStackStatusResponse(const RadioResponseInfo& info, const bool enabled);
+};
+
+/* Callback class for radio indication */
+class RadioIndication_v1_3 : public ::android::hardware::radio::V1_3::IRadioIndication {
+   protected:
+    RadioHidlTest_v1_3& parent_v1_3;
+
+   public:
+    RadioIndication_v1_3(RadioHidlTest_v1_3& parent_v1_3);
+    virtual ~RadioIndication_v1_3() = default;
+
+    /* 1.2 Api */
+    Return<void> networkScanResult_1_2(
+            RadioIndicationType type,
+            const ::android::hardware::radio::V1_2::NetworkScanResult& result);
+
+    Return<void> cellInfoList_1_2(
+            RadioIndicationType type,
+            const ::android::hardware::hidl_vec<::android::hardware::radio::V1_2::CellInfo>&
+                    records);
+
+    Return<void> currentLinkCapacityEstimate(
+            RadioIndicationType type,
+            const ::android::hardware::radio::V1_2::LinkCapacityEstimate& lce);
+
+    Return<void> currentPhysicalChannelConfigs(
+            RadioIndicationType type,
+            const ::android::hardware::hidl_vec<
+                    ::android::hardware::radio::V1_2::PhysicalChannelConfig>& configs);
+
+    Return<void> currentSignalStrength_1_2(
+            RadioIndicationType type,
+            const ::android::hardware::radio::V1_2::SignalStrength& signalStrength);
+
+    /* 1.1 Api */
+    Return<void> carrierInfoForImsiEncryption(RadioIndicationType info);
+
+    Return<void> networkScanResult(
+            RadioIndicationType type,
+            const ::android::hardware::radio::V1_1::NetworkScanResult& result);
+
+    Return<void> keepaliveStatus(RadioIndicationType type, const KeepaliveStatus& status);
+
+    /* 1.0 Api */
+    Return<void> radioStateChanged(RadioIndicationType type, RadioState radioState);
+
+    Return<void> callStateChanged(RadioIndicationType type);
+
+    Return<void> networkStateChanged(RadioIndicationType type);
+
+    Return<void> newSms(RadioIndicationType type,
+                        const ::android::hardware::hidl_vec<uint8_t>& pdu);
+
+    Return<void> newSmsStatusReport(RadioIndicationType type,
+                                    const ::android::hardware::hidl_vec<uint8_t>& pdu);
+
+    Return<void> newSmsOnSim(RadioIndicationType type, int32_t recordNumber);
+
+    Return<void> onUssd(RadioIndicationType type, UssdModeType modeType,
+                        const ::android::hardware::hidl_string& msg);
+
+    Return<void> nitzTimeReceived(RadioIndicationType type,
+                                  const ::android::hardware::hidl_string& nitzTime,
+                                  uint64_t receivedTime);
+
+    Return<void> currentSignalStrength(
+            RadioIndicationType type,
+            const ::android::hardware::radio::V1_0::SignalStrength& signalStrength);
+
+    Return<void> dataCallListChanged(
+            RadioIndicationType type,
+            const ::android::hardware::hidl_vec<SetupDataCallResult>& dcList);
+
+    Return<void> suppSvcNotify(RadioIndicationType type, const SuppSvcNotification& suppSvc);
+
+    Return<void> stkSessionEnd(RadioIndicationType type);
+
+    Return<void> stkProactiveCommand(RadioIndicationType type,
+                                     const ::android::hardware::hidl_string& cmd);
+
+    Return<void> stkEventNotify(RadioIndicationType type,
+                                const ::android::hardware::hidl_string& cmd);
+
+    Return<void> stkCallSetup(RadioIndicationType type, int64_t timeout);
+
+    Return<void> simSmsStorageFull(RadioIndicationType type);
+
+    Return<void> simRefresh(RadioIndicationType type, const SimRefreshResult& refreshResult);
+
+    Return<void> callRing(RadioIndicationType type, bool isGsm, const CdmaSignalInfoRecord& record);
+
+    Return<void> simStatusChanged(RadioIndicationType type);
+
+    Return<void> cdmaNewSms(RadioIndicationType type, const CdmaSmsMessage& msg);
+
+    Return<void> newBroadcastSms(RadioIndicationType type,
+                                 const ::android::hardware::hidl_vec<uint8_t>& data);
+
+    Return<void> cdmaRuimSmsStorageFull(RadioIndicationType type);
+
+    Return<void> restrictedStateChanged(RadioIndicationType type, PhoneRestrictedState state);
+
+    Return<void> enterEmergencyCallbackMode(RadioIndicationType type);
+
+    Return<void> cdmaCallWaiting(RadioIndicationType type,
+                                 const CdmaCallWaiting& callWaitingRecord);
+
+    Return<void> cdmaOtaProvisionStatus(RadioIndicationType type, CdmaOtaProvisionStatus status);
+
+    Return<void> cdmaInfoRec(RadioIndicationType type, const CdmaInformationRecords& records);
+
+    Return<void> indicateRingbackTone(RadioIndicationType type, bool start);
+
+    Return<void> resendIncallMute(RadioIndicationType type);
+
+    Return<void> cdmaSubscriptionSourceChanged(RadioIndicationType type,
+                                               CdmaSubscriptionSource cdmaSource);
+
+    Return<void> cdmaPrlChanged(RadioIndicationType type, int32_t version);
+
+    Return<void> exitEmergencyCallbackMode(RadioIndicationType type);
+
+    Return<void> rilConnected(RadioIndicationType type);
+
+    Return<void> voiceRadioTechChanged(RadioIndicationType type, RadioTechnology rat);
+
+    Return<void> cellInfoList(
+            RadioIndicationType type,
+            const ::android::hardware::hidl_vec<::android::hardware::radio::V1_0::CellInfo>&
+                    records);
+
+    Return<void> imsNetworkStateChanged(RadioIndicationType type);
+
+    Return<void> subscriptionStatusChanged(RadioIndicationType type, bool activate);
+
+    Return<void> srvccStateNotify(RadioIndicationType type, SrvccState state);
+
+    Return<void> hardwareConfigChanged(
+            RadioIndicationType type, const ::android::hardware::hidl_vec<HardwareConfig>& configs);
+
+    Return<void> radioCapabilityIndication(RadioIndicationType type, const RadioCapability& rc);
+
+    Return<void> onSupplementaryServiceIndication(RadioIndicationType type,
+                                                  const StkCcUnsolSsResult& ss);
+
+    Return<void> stkCallControlAlphaNotify(RadioIndicationType type,
+                                           const ::android::hardware::hidl_string& alpha);
+
+    Return<void> lceData(RadioIndicationType type, const LceDataInfo& lce);
+
+    Return<void> pcoData(RadioIndicationType type, const PcoDataInfo& pco);
+
+    Return<void> modemReset(RadioIndicationType type,
+                            const ::android::hardware::hidl_string& reason);
+};
+
+// Test environment for Radio HIDL HAL.
+class RadioHidlEnvironment : public ::testing::VtsHalHidlTargetTestEnvBase {
+   public:
+    // get the test environment singleton
+    static RadioHidlEnvironment* Instance() {
+        static RadioHidlEnvironment* instance = new RadioHidlEnvironment;
+        return instance;
+    }
+    virtual void registerTestServices() override {
+        registerTestService<::android::hardware::radio::V1_3::IRadio>();
+    }
+
+   private:
+    RadioHidlEnvironment() {}
+};
+
+// The main test class for Radio HIDL.
+class RadioHidlTest_v1_3 : public ::testing::VtsHalHidlTargetTestBase {
+   protected:
+    std::mutex mtx_;
+    std::condition_variable cv_;
+    int count_;
+
+    /* Serial number for radio request */
+    int serial;
+
+    /* Update Sim Card Status */
+    void updateSimCardStatus();
+
+   public:
+    virtual void SetUp() override;
+
+    /* Used as a mechanism to inform the test about data/event callback */
+    void notify(int receivedSerial);
+
+    /* Test code calls this function to wait for response */
+    std::cv_status wait();
+
+    /* radio service handle */
+    sp<::android::hardware::radio::V1_3::IRadio> radio_v1_3;
+
+    /* radio response handle */
+    sp<RadioResponse_v1_3> radioRsp_v1_3;
+
+    /* radio indication handle */
+    sp<RadioIndication_v1_3> radioInd_v1_3;
+};
\ No newline at end of file
diff --git a/radio/1.3/vts/functional/radio_indication.cpp b/radio/1.3/vts/functional/radio_indication.cpp
new file mode 100644
index 0000000..034825e
--- /dev/null
+++ b/radio/1.3/vts/functional/radio_indication.cpp
@@ -0,0 +1,288 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <radio_hidl_hal_utils_v1_3.h>
+
+RadioIndication_v1_3::RadioIndication_v1_3(RadioHidlTest_v1_3& parent) : parent_v1_3(parent) {}
+
+/* 1.2 Apis */
+Return<void> RadioIndication_v1_3::networkScanResult_1_2(
+        RadioIndicationType /*type*/,
+        const ::android::hardware::radio::V1_2::NetworkScanResult& /*result*/) {
+    return Void();
+}
+
+Return<void> RadioIndication_v1_3::cellInfoList_1_2(
+        RadioIndicationType /*type*/,
+        const ::android::hardware::hidl_vec<
+                ::android::hardware::radio::V1_2::CellInfo>& /*records*/) {
+    return Void();
+}
+
+Return<void> RadioIndication_v1_3::currentLinkCapacityEstimate(
+        RadioIndicationType /*type*/,
+        const ::android::hardware::radio::V1_2::LinkCapacityEstimate& /*lce*/) {
+    return Void();
+}
+
+Return<void> RadioIndication_v1_3::currentPhysicalChannelConfigs(
+        RadioIndicationType /*type*/,
+        const ::android::hardware::hidl_vec<
+                ::android::hardware::radio::V1_2::PhysicalChannelConfig>& /*configs*/) {
+    return Void();
+}
+
+Return<void> RadioIndication_v1_3::currentSignalStrength_1_2(
+        RadioIndicationType /*type*/,
+        const ::android::hardware::radio::V1_2::SignalStrength& /*signalStrength*/) {
+    return Void();
+}
+
+/* 1.1 Apis */
+Return<void> RadioIndication_v1_3::carrierInfoForImsiEncryption(RadioIndicationType /*info*/) {
+    return Void();
+}
+
+Return<void> RadioIndication_v1_3::networkScanResult(
+        RadioIndicationType /*type*/,
+        const ::android::hardware::radio::V1_1::NetworkScanResult& /*result*/) {
+    return Void();
+}
+
+Return<void> RadioIndication_v1_3::keepaliveStatus(RadioIndicationType /*type*/,
+                                                   const KeepaliveStatus& /*status*/) {
+    return Void();
+}
+
+/* 1.0 Apis */
+Return<void> RadioIndication_v1_3::radioStateChanged(RadioIndicationType /*type*/,
+                                                     RadioState /*radioState*/) {
+    return Void();
+}
+
+Return<void> RadioIndication_v1_3::callStateChanged(RadioIndicationType /*type*/) {
+    return Void();
+}
+
+Return<void> RadioIndication_v1_3::networkStateChanged(RadioIndicationType /*type*/) {
+    return Void();
+}
+
+Return<void> RadioIndication_v1_3::newSms(RadioIndicationType /*type*/,
+                                          const ::android::hardware::hidl_vec<uint8_t>& /*pdu*/) {
+    return Void();
+}
+
+Return<void> RadioIndication_v1_3::newSmsStatusReport(
+        RadioIndicationType /*type*/, const ::android::hardware::hidl_vec<uint8_t>& /*pdu*/) {
+    return Void();
+}
+
+Return<void> RadioIndication_v1_3::newSmsOnSim(RadioIndicationType /*type*/,
+                                               int32_t /*recordNumber*/) {
+    return Void();
+}
+
+Return<void> RadioIndication_v1_3::onUssd(RadioIndicationType /*type*/, UssdModeType /*modeType*/,
+                                          const ::android::hardware::hidl_string& /*msg*/) {
+    return Void();
+}
+
+Return<void> RadioIndication_v1_3::nitzTimeReceived(
+        RadioIndicationType /*type*/, const ::android::hardware::hidl_string& /*nitzTime*/,
+        uint64_t /*receivedTime*/) {
+    return Void();
+}
+
+Return<void> RadioIndication_v1_3::currentSignalStrength(
+        RadioIndicationType /*type*/,
+        const ::android::hardware::radio::V1_0::SignalStrength& /*signalStrength*/) {
+    return Void();
+}
+
+Return<void> RadioIndication_v1_3::dataCallListChanged(
+        RadioIndicationType /*type*/,
+        const ::android::hardware::hidl_vec<SetupDataCallResult>& /*dcList*/) {
+    return Void();
+}
+
+Return<void> RadioIndication_v1_3::suppSvcNotify(RadioIndicationType /*type*/,
+                                                 const SuppSvcNotification& /*suppSvc*/) {
+    return Void();
+}
+
+Return<void> RadioIndication_v1_3::stkSessionEnd(RadioIndicationType /*type*/) {
+    return Void();
+}
+
+Return<void> RadioIndication_v1_3::stkProactiveCommand(
+        RadioIndicationType /*type*/, const ::android::hardware::hidl_string& /*cmd*/) {
+    return Void();
+}
+
+Return<void> RadioIndication_v1_3::stkEventNotify(RadioIndicationType /*type*/,
+                                                  const ::android::hardware::hidl_string& /*cmd*/) {
+    return Void();
+}
+
+Return<void> RadioIndication_v1_3::stkCallSetup(RadioIndicationType /*type*/, int64_t /*timeout*/) {
+    return Void();
+}
+
+Return<void> RadioIndication_v1_3::simSmsStorageFull(RadioIndicationType /*type*/) {
+    return Void();
+}
+
+Return<void> RadioIndication_v1_3::simRefresh(RadioIndicationType /*type*/,
+                                              const SimRefreshResult& /*refreshResult*/) {
+    return Void();
+}
+
+Return<void> RadioIndication_v1_3::callRing(RadioIndicationType /*type*/, bool /*isGsm*/,
+                                            const CdmaSignalInfoRecord& /*record*/) {
+    return Void();
+}
+
+Return<void> RadioIndication_v1_3::simStatusChanged(RadioIndicationType /*type*/) {
+    return Void();
+}
+
+Return<void> RadioIndication_v1_3::cdmaNewSms(RadioIndicationType /*type*/,
+                                              const CdmaSmsMessage& /*msg*/) {
+    return Void();
+}
+
+Return<void> RadioIndication_v1_3::newBroadcastSms(
+        RadioIndicationType /*type*/, const ::android::hardware::hidl_vec<uint8_t>& /*data*/) {
+    return Void();
+}
+
+Return<void> RadioIndication_v1_3::cdmaRuimSmsStorageFull(RadioIndicationType /*type*/) {
+    return Void();
+}
+
+Return<void> RadioIndication_v1_3::restrictedStateChanged(RadioIndicationType /*type*/,
+                                                          PhoneRestrictedState /*state*/) {
+    return Void();
+}
+
+Return<void> RadioIndication_v1_3::enterEmergencyCallbackMode(RadioIndicationType /*type*/) {
+    return Void();
+}
+
+Return<void> RadioIndication_v1_3::cdmaCallWaiting(RadioIndicationType /*type*/,
+                                                   const CdmaCallWaiting& /*callWaitingRecord*/) {
+    return Void();
+}
+
+Return<void> RadioIndication_v1_3::cdmaOtaProvisionStatus(RadioIndicationType /*type*/,
+                                                          CdmaOtaProvisionStatus /*status*/) {
+    return Void();
+}
+
+Return<void> RadioIndication_v1_3::cdmaInfoRec(RadioIndicationType /*type*/,
+                                               const CdmaInformationRecords& /*records*/) {
+    return Void();
+}
+
+Return<void> RadioIndication_v1_3::indicateRingbackTone(RadioIndicationType /*type*/,
+                                                        bool /*start*/) {
+    return Void();
+}
+
+Return<void> RadioIndication_v1_3::resendIncallMute(RadioIndicationType /*type*/) {
+    return Void();
+}
+
+Return<void> RadioIndication_v1_3::cdmaSubscriptionSourceChanged(
+        RadioIndicationType /*type*/, CdmaSubscriptionSource /*cdmaSource*/) {
+    return Void();
+}
+
+Return<void> RadioIndication_v1_3::cdmaPrlChanged(RadioIndicationType /*type*/,
+                                                  int32_t /*version*/) {
+    return Void();
+}
+
+Return<void> RadioIndication_v1_3::exitEmergencyCallbackMode(RadioIndicationType /*type*/) {
+    return Void();
+}
+
+Return<void> RadioIndication_v1_3::rilConnected(RadioIndicationType /*type*/) {
+    return Void();
+}
+
+Return<void> RadioIndication_v1_3::voiceRadioTechChanged(RadioIndicationType /*type*/,
+                                                         RadioTechnology /*rat*/) {
+    return Void();
+}
+
+Return<void> RadioIndication_v1_3::cellInfoList(
+        RadioIndicationType /*type*/,
+        const ::android::hardware::hidl_vec<
+                ::android::hardware::radio::V1_0::CellInfo>& /*records*/) {
+    return Void();
+}
+
+Return<void> RadioIndication_v1_3::imsNetworkStateChanged(RadioIndicationType /*type*/) {
+    return Void();
+}
+
+Return<void> RadioIndication_v1_3::subscriptionStatusChanged(RadioIndicationType /*type*/,
+                                                             bool /*activate*/) {
+    return Void();
+}
+
+Return<void> RadioIndication_v1_3::srvccStateNotify(RadioIndicationType /*type*/,
+                                                    SrvccState /*state*/) {
+    return Void();
+}
+
+Return<void> RadioIndication_v1_3::hardwareConfigChanged(
+        RadioIndicationType /*type*/,
+        const ::android::hardware::hidl_vec<HardwareConfig>& /*configs*/) {
+    return Void();
+}
+
+Return<void> RadioIndication_v1_3::radioCapabilityIndication(RadioIndicationType /*type*/,
+                                                             const RadioCapability& /*rc*/) {
+    return Void();
+}
+
+Return<void> RadioIndication_v1_3::onSupplementaryServiceIndication(
+        RadioIndicationType /*type*/, const StkCcUnsolSsResult& /*ss*/) {
+    return Void();
+}
+
+Return<void> RadioIndication_v1_3::stkCallControlAlphaNotify(
+        RadioIndicationType /*type*/, const ::android::hardware::hidl_string& /*alpha*/) {
+    return Void();
+}
+
+Return<void> RadioIndication_v1_3::lceData(RadioIndicationType /*type*/,
+                                           const LceDataInfo& /*lce*/) {
+    return Void();
+}
+
+Return<void> RadioIndication_v1_3::pcoData(RadioIndicationType /*type*/,
+                                           const PcoDataInfo& /*pco*/) {
+    return Void();
+}
+
+Return<void> RadioIndication_v1_3::modemReset(RadioIndicationType /*type*/,
+                                              const ::android::hardware::hidl_string& /*reason*/) {
+    return Void();
+}
\ No newline at end of file
diff --git a/radio/1.3/vts/functional/radio_response.cpp b/radio/1.3/vts/functional/radio_response.cpp
new file mode 100644
index 0000000..900794e
--- /dev/null
+++ b/radio/1.3/vts/functional/radio_response.cpp
@@ -0,0 +1,786 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <radio_hidl_hal_utils_v1_3.h>
+
+::android::hardware::radio::V1_2::CardStatus cardStatus;
+
+RadioResponse_v1_3::RadioResponse_v1_3(RadioHidlTest_v1_3& parent) : parent_v1_3(parent) {}
+
+/* 1.0 Apis */
+Return<void> RadioResponse_v1_3::getIccCardStatusResponse(
+        const RadioResponseInfo& /*info*/,
+        const ::android::hardware::radio::V1_0::CardStatus& /*card_status*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::supplyIccPinForAppResponse(const RadioResponseInfo& /*info*/,
+                                                            int32_t /*remainingRetries*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::supplyIccPukForAppResponse(const RadioResponseInfo& /*info*/,
+                                                            int32_t /*remainingRetries*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::supplyIccPin2ForAppResponse(const RadioResponseInfo& /*info*/,
+                                                             int32_t /*remainingRetries*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::supplyIccPuk2ForAppResponse(const RadioResponseInfo& /*info*/,
+                                                             int32_t /*remainingRetries*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::changeIccPinForAppResponse(const RadioResponseInfo& /*info*/,
+                                                            int32_t /*remainingRetries*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::changeIccPin2ForAppResponse(const RadioResponseInfo& /*info*/,
+                                                             int32_t /*remainingRetries*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::supplyNetworkDepersonalizationResponse(
+        const RadioResponseInfo& /*info*/, int32_t /*remainingRetries*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::getCurrentCallsResponse(
+        const RadioResponseInfo& /*info*/,
+        const ::android::hardware::hidl_vec<::android::hardware::radio::V1_0::Call>& /*calls*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::dialResponse(const RadioResponseInfo& /*info*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::getIMSIForAppResponse(
+        const RadioResponseInfo& /*info*/, const ::android::hardware::hidl_string& /*imsi*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::hangupConnectionResponse(const RadioResponseInfo& /*info*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::hangupWaitingOrBackgroundResponse(
+        const RadioResponseInfo& /*info*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::hangupForegroundResumeBackgroundResponse(
+        const RadioResponseInfo& /*info*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::switchWaitingOrHoldingAndActiveResponse(
+        const RadioResponseInfo& /*info*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::conferenceResponse(const RadioResponseInfo& /*info*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::rejectCallResponse(const RadioResponseInfo& /*info*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::getLastCallFailCauseResponse(
+        const RadioResponseInfo& /*info*/, const LastCallFailCauseInfo& /*failCauseInfo*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::getSignalStrengthResponse(
+        const RadioResponseInfo& /*info*/,
+        const ::android::hardware::radio::V1_0::SignalStrength& /*sig_strength*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::getVoiceRegistrationStateResponse(
+        const RadioResponseInfo& /*info*/,
+        const ::android::hardware::radio::V1_0::VoiceRegStateResult& /*voiceRegResponse*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::getDataRegistrationStateResponse(
+        const RadioResponseInfo& /*info*/,
+        const ::android::hardware::radio::V1_0::DataRegStateResult& /*dataRegResponse*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::getOperatorResponse(
+        const RadioResponseInfo& /*info*/, const ::android::hardware::hidl_string& /*longName*/,
+        const ::android::hardware::hidl_string& /*shortName*/,
+        const ::android::hardware::hidl_string& /*numeric*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::setRadioPowerResponse(const RadioResponseInfo& /*info*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::sendDtmfResponse(const RadioResponseInfo& /*info*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::sendSmsResponse(const RadioResponseInfo& /*info*/,
+                                                 const SendSmsResult& /*sms*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::sendSMSExpectMoreResponse(const RadioResponseInfo& /*info*/,
+                                                           const SendSmsResult& /*sms*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::setupDataCallResponse(const RadioResponseInfo& info,
+                                                       const SetupDataCallResult& /*dcResponse*/) {
+    rspInfo = info;
+    parent_v1_3.notify(info.serial);
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::iccIOForAppResponse(const RadioResponseInfo& /*info*/,
+                                                     const IccIoResult& /*iccIo*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::sendUssdResponse(const RadioResponseInfo& /*info*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::cancelPendingUssdResponse(const RadioResponseInfo& /*info*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::getClirResponse(const RadioResponseInfo& /*info*/, int32_t /*n*/,
+                                                 int32_t /*m*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::setClirResponse(const RadioResponseInfo& /*info*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::getCallForwardStatusResponse(
+        const RadioResponseInfo& /*info*/, const ::android::hardware::hidl_vec<CallForwardInfo>&
+        /*callForwardInfos*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::setCallForwardResponse(const RadioResponseInfo& /*info*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::getCallWaitingResponse(const RadioResponseInfo& /*info*/,
+                                                        bool /*enable*/, int32_t /*serviceClass*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::setCallWaitingResponse(const RadioResponseInfo& /*info*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::acknowledgeLastIncomingGsmSmsResponse(
+        const RadioResponseInfo& /*info*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::acceptCallResponse(const RadioResponseInfo& /*info*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::deactivateDataCallResponse(const RadioResponseInfo& info) {
+    rspInfo = info;
+    parent_v1_3.notify(info.serial);
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::getFacilityLockForAppResponse(const RadioResponseInfo& /*info*/,
+                                                               int32_t /*response*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::setFacilityLockForAppResponse(const RadioResponseInfo& /*info*/,
+                                                               int32_t /*retry*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::setBarringPasswordResponse(const RadioResponseInfo& /*info*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::getNetworkSelectionModeResponse(const RadioResponseInfo& /*info*/,
+                                                                 bool /*manual*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::setNetworkSelectionModeAutomaticResponse(
+        const RadioResponseInfo& /*info*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::setNetworkSelectionModeManualResponse(
+        const RadioResponseInfo& /*info*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::getAvailableNetworksResponse(
+        const RadioResponseInfo& /*info*/,
+        const ::android::hardware::hidl_vec<OperatorInfo>& /*networkInfos*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::startDtmfResponse(const RadioResponseInfo& /*info*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::stopDtmfResponse(const RadioResponseInfo& /*info*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::getBasebandVersionResponse(
+        const RadioResponseInfo& /*info*/, const ::android::hardware::hidl_string& /*version*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::separateConnectionResponse(const RadioResponseInfo& /*info*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::setMuteResponse(const RadioResponseInfo& /*info*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::getMuteResponse(const RadioResponseInfo& /*info*/,
+                                                 bool /*enable*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::getClipResponse(const RadioResponseInfo& /*info*/,
+                                                 ClipStatus /*status*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::getDataCallListResponse(
+        const RadioResponseInfo& /*info*/,
+        const ::android::hardware::hidl_vec<SetupDataCallResult>& /*dcResponse*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::sendOemRilRequestRawResponse(
+        const RadioResponseInfo& /*info*/, const ::android::hardware::hidl_vec<uint8_t>& /*data*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::sendOemRilRequestStringsResponse(
+        const RadioResponseInfo& /*info*/,
+        const ::android::hardware::hidl_vec<::android::hardware::hidl_string>& /*data*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::setSuppServiceNotificationsResponse(
+        const RadioResponseInfo& /*info*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::writeSmsToSimResponse(const RadioResponseInfo& /*info*/,
+                                                       int32_t /*index*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::deleteSmsOnSimResponse(const RadioResponseInfo& /*info*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::setBandModeResponse(const RadioResponseInfo& /*info*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::getAvailableBandModesResponse(
+        const RadioResponseInfo& info,
+        const ::android::hardware::hidl_vec<RadioBandMode>& /* bandModes */) {
+    rspInfo = info;
+    parent_v1_3.notify(info.serial);
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::sendEnvelopeResponse(
+        const RadioResponseInfo& /*info*/,
+        const ::android::hardware::hidl_string& /*commandResponse*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::sendTerminalResponseToSimResponse(
+        const RadioResponseInfo& /*info*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::handleStkCallSetupRequestFromSimResponse(
+        const RadioResponseInfo& /*info*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::explicitCallTransferResponse(const RadioResponseInfo& /*info*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::setPreferredNetworkTypeResponse(
+        const RadioResponseInfo& /*info*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::getPreferredNetworkTypeResponse(const RadioResponseInfo& /*info*/,
+                                                                 PreferredNetworkType /*nw_type*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::getNeighboringCidsResponse(
+        const RadioResponseInfo& /*info*/,
+        const ::android::hardware::hidl_vec<NeighboringCell>& /*cells*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::setLocationUpdatesResponse(const RadioResponseInfo& /*info*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::setCdmaSubscriptionSourceResponse(
+        const RadioResponseInfo& /*info*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::setCdmaRoamingPreferenceResponse(
+        const RadioResponseInfo& /*info*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::getCdmaRoamingPreferenceResponse(const RadioResponseInfo& /*info*/,
+                                                                  CdmaRoamingType /*type*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::setTTYModeResponse(const RadioResponseInfo& /*info*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::getTTYModeResponse(const RadioResponseInfo& /*info*/,
+                                                    TtyMode /*mode*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::setPreferredVoicePrivacyResponse(
+        const RadioResponseInfo& /*info*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::getPreferredVoicePrivacyResponse(const RadioResponseInfo& /*info*/,
+                                                                  bool /*enable*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::sendCDMAFeatureCodeResponse(const RadioResponseInfo& /*info*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::sendBurstDtmfResponse(const RadioResponseInfo& /*info*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::sendCdmaSmsResponse(const RadioResponseInfo& /*info*/,
+                                                     const SendSmsResult& /*sms*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::acknowledgeLastIncomingCdmaSmsResponse(
+        const RadioResponseInfo& /*info*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::getGsmBroadcastConfigResponse(
+        const RadioResponseInfo& /*info*/,
+        const ::android::hardware::hidl_vec<GsmBroadcastSmsConfigInfo>& /*configs*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::setGsmBroadcastConfigResponse(const RadioResponseInfo& /*info*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::setGsmBroadcastActivationResponse(
+        const RadioResponseInfo& /*info*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::getCdmaBroadcastConfigResponse(
+        const RadioResponseInfo& /*info*/,
+        const ::android::hardware::hidl_vec<CdmaBroadcastSmsConfigInfo>& /*configs*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::setCdmaBroadcastConfigResponse(const RadioResponseInfo& /*info*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::setCdmaBroadcastActivationResponse(
+        const RadioResponseInfo& /*info*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::getCDMASubscriptionResponse(
+        const RadioResponseInfo& /*info*/, const ::android::hardware::hidl_string& /*mdn*/,
+        const ::android::hardware::hidl_string& /*hSid*/,
+        const ::android::hardware::hidl_string& /*hNid*/,
+        const ::android::hardware::hidl_string& /*min*/,
+        const ::android::hardware::hidl_string& /*prl*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::writeSmsToRuimResponse(const RadioResponseInfo& /*info*/,
+                                                        uint32_t /*index*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::deleteSmsOnRuimResponse(const RadioResponseInfo& /*info*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::getDeviceIdentityResponse(
+        const RadioResponseInfo& /*info*/, const ::android::hardware::hidl_string& /*imei*/,
+        const ::android::hardware::hidl_string& /*imeisv*/,
+        const ::android::hardware::hidl_string& /*esn*/,
+        const ::android::hardware::hidl_string& /*meid*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::exitEmergencyCallbackModeResponse(
+        const RadioResponseInfo& /*info*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::getSmscAddressResponse(
+        const RadioResponseInfo& /*info*/, const ::android::hardware::hidl_string& /*smsc*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::setSmscAddressResponse(const RadioResponseInfo& /*info*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::reportSmsMemoryStatusResponse(const RadioResponseInfo& /*info*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::reportStkServiceIsRunningResponse(
+        const RadioResponseInfo& /*info*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::getCdmaSubscriptionSourceResponse(
+        const RadioResponseInfo& /*info*/, CdmaSubscriptionSource /*source*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::requestIsimAuthenticationResponse(
+        const RadioResponseInfo& /*info*/, const ::android::hardware::hidl_string& /*response*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::acknowledgeIncomingGsmSmsWithPduResponse(
+        const RadioResponseInfo& /*info*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::sendEnvelopeWithStatusResponse(const RadioResponseInfo& /*info*/,
+                                                                const IccIoResult& /*iccIo*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::getVoiceRadioTechnologyResponse(const RadioResponseInfo& /*info*/,
+                                                                 RadioTechnology /*rat*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::getCellInfoListResponse(
+        const RadioResponseInfo& /*info*/,
+        const ::android::hardware::hidl_vec<
+                ::android::hardware::radio::V1_0::CellInfo>& /*cellInfo*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::setCellInfoListRateResponse(const RadioResponseInfo& /*info*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::setInitialAttachApnResponse(const RadioResponseInfo& /*info*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::getImsRegistrationStateResponse(
+        const RadioResponseInfo& /*info*/, bool /*isRegistered*/,
+        RadioTechnologyFamily /*ratFamily*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::sendImsSmsResponse(const RadioResponseInfo& /*info*/,
+                                                    const SendSmsResult& /*sms*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::iccTransmitApduBasicChannelResponse(
+        const RadioResponseInfo& /*info*/, const IccIoResult& /*result*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::iccOpenLogicalChannelResponse(
+        const RadioResponseInfo& /*info*/, int32_t /*channelId*/,
+        const ::android::hardware::hidl_vec<int8_t>& /*selectResponse*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::iccCloseLogicalChannelResponse(const RadioResponseInfo& /*info*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::iccTransmitApduLogicalChannelResponse(
+        const RadioResponseInfo& /*info*/, const IccIoResult& /*result*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::nvReadItemResponse(
+        const RadioResponseInfo& /*info*/, const ::android::hardware::hidl_string& /*result*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::nvWriteItemResponse(const RadioResponseInfo& /*info*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::nvWriteCdmaPrlResponse(const RadioResponseInfo& /*info*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::nvResetConfigResponse(const RadioResponseInfo& /*info*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::setUiccSubscriptionResponse(const RadioResponseInfo& /*info*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::setDataAllowedResponse(const RadioResponseInfo& /*info*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::getHardwareConfigResponse(
+        const RadioResponseInfo& /*info*/,
+        const ::android::hardware::hidl_vec<HardwareConfig>& /*config*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::requestIccSimAuthenticationResponse(
+        const RadioResponseInfo& /*info*/, const IccIoResult& /*result*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::setDataProfileResponse(const RadioResponseInfo& /*info*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::requestShutdownResponse(const RadioResponseInfo& /*info*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::getRadioCapabilityResponse(const RadioResponseInfo& /*info*/,
+                                                            const RadioCapability& /*rc*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::setRadioCapabilityResponse(const RadioResponseInfo& /*info*/,
+                                                            const RadioCapability& /*rc*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::startLceServiceResponse(const RadioResponseInfo& /*info*/,
+                                                         const LceStatusInfo& /*statusInfo*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::stopLceServiceResponse(const RadioResponseInfo& /*info*/,
+                                                        const LceStatusInfo& /*statusInfo*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::pullLceDataResponse(const RadioResponseInfo& /*info*/,
+                                                     const LceDataInfo& /*lceInfo*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::getModemActivityInfoResponse(
+        const RadioResponseInfo& /*info*/, const ActivityStatsInfo& /*activityInfo*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::setAllowedCarriersResponse(const RadioResponseInfo& /*info*/,
+                                                            int32_t /*numAllowed*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::getAllowedCarriersResponse(
+        const RadioResponseInfo& /*info*/, bool /*allAllowed*/,
+        const CarrierRestrictions& /*carriers*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::sendDeviceStateResponse(const RadioResponseInfo& /*info*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::setIndicationFilterResponse(const RadioResponseInfo& info) {
+    rspInfo = info;
+    parent_v1_3.notify(info.serial);
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::setSimCardPowerResponse(const RadioResponseInfo& /*info*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::acknowledgeRequest(int32_t /*serial*/) {
+    return Void();
+}
+
+/* 1.1 Apis */
+Return<void> RadioResponse_v1_3::setCarrierInfoForImsiEncryptionResponse(
+        const RadioResponseInfo& /*info*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::setSimCardPowerResponse_1_1(const RadioResponseInfo& /*info*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::startNetworkScanResponse(const RadioResponseInfo& info) {
+    rspInfo = info;
+    parent_v1_3.notify(info.serial);
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::stopNetworkScanResponse(const RadioResponseInfo& info) {
+    rspInfo = info;
+    parent_v1_3.notify(info.serial);
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::startKeepaliveResponse(const RadioResponseInfo& /*info*/,
+                                                        const KeepaliveStatus& /*status*/) {
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::stopKeepaliveResponse(const RadioResponseInfo& /*info*/) {
+    return Void();
+}
+
+/* 1.2 Apis */
+Return<void> RadioResponse_v1_3::setSignalStrengthReportingCriteriaResponse(
+        const RadioResponseInfo& info) {
+    rspInfo = info;
+    parent_v1_3.notify(info.serial);
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::setLinkCapacityReportingCriteriaResponse(
+        const RadioResponseInfo& info) {
+    rspInfo = info;
+    parent_v1_3.notify(info.serial);
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::getIccCardStatusResponse_1_2(
+        const RadioResponseInfo& info,
+        const ::android::hardware::radio::V1_2::CardStatus& card_status) {
+    rspInfo = info;
+    cardStatus = card_status;
+    parent_v1_3.notify(info.serial);
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::getCurrentCallsResponse_1_2(
+        const RadioResponseInfo& info,
+        const ::android::hardware::hidl_vec<::android::hardware::radio::V1_2::Call>& /*calls*/) {
+    rspInfo = info;
+    parent_v1_3.notify(info.serial);
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::getSignalStrengthResponse_1_2(
+        const RadioResponseInfo& info,
+        const ::android::hardware::radio::V1_2::SignalStrength& /*sig_strength*/) {
+    rspInfo = info;
+    parent_v1_3.notify(info.serial);
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::getCellInfoListResponse_1_2(
+        const RadioResponseInfo& info,
+        const ::android::hardware::hidl_vec<
+                ::android::hardware::radio::V1_2::CellInfo>& /*cellInfo*/) {
+    rspInfo = info;
+    parent_v1_3.notify(info.serial);
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::getVoiceRegistrationStateResponse_1_2(
+        const RadioResponseInfo& info,
+        const ::android::hardware::radio::V1_2::VoiceRegStateResult& /*voiceRegResponse*/) {
+    rspInfo = info;
+    parent_v1_3.notify(info.serial);
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::getDataRegistrationStateResponse_1_2(
+        const RadioResponseInfo& info,
+        const ::android::hardware::radio::V1_2::DataRegStateResult& dataRegResponse) {
+    rspInfo = info;
+    dataRegResp = dataRegResponse;
+    parent_v1_3.notify(info.serial);
+    return Void();
+}
+
+/* 1.3 Api */
+Return<void> RadioResponse_v1_3::setSystemSelectionChannelsResponse(const RadioResponseInfo& info) {
+    rspInfo = info;
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::enableModemResponse(const RadioResponseInfo& info) {
+    rspInfo = info;
+    enableModemResponseToggle = !enableModemResponseToggle;
+    return Void();
+}
+
+Return<void> RadioResponse_v1_3::getModemStackStatusResponse(const RadioResponseInfo& info,
+                                                             const bool enabled) {
+    rspInfo = info;
+    isModemEnabled = enabled;
+    return Void();
+}
diff --git a/radio/1.4/IRadioResponse.hal b/radio/1.4/IRadioResponse.hal
index 77aad03..6b8977d 100644
--- a/radio/1.4/IRadioResponse.hal
+++ b/radio/1.4/IRadioResponse.hal
@@ -40,7 +40,6 @@
      *   RadioError:DIAL_MODIFIED_TO_SS
      *   RadioError:DIAL_MODIFIED_TO_DIAL
      *   RadioError:INVALID_ARGUMENTS
-     *   RadioError:NO_MEMORY
      *   RadioError:NO_RESOURCES
      *   RadioError:INTERNAL_ERR
      *   RadioError:FDN_CHECK_FAILURE
@@ -51,7 +50,6 @@
      *   RadioError:DEVICE_IN_USE
      *   RadioError:ABORTED
      *   RadioError:INVALID_MODEM_STATE
-     *   RadioError:CANCELLED
      */
     oneway emergencyDialResponse(RadioResponseInfo info);
 
@@ -66,7 +64,6 @@
      *   RadioError:RADIO_NOT_AVAILABLE
      *   RadioError:DEVICE_IN_USE
      *   RadioError:INTERNAL_ERR
-     *   RadioError:NO_MEMORY
      *   RadioError:MODEM_ERR
      *   RadioError:INVALID_ARGUMENTS
      */
@@ -105,9 +102,7 @@
      *   RadioError:NONE
      *   RadioError:RADIO_NOT_AVAILABLE
      *   RadioError:INTERNAL_ERR
-     *   RadioError:NO_MEMORY
      *   RadioError:NO_RESOURCES
-     *   RadioError:CANCELLED
      *   RadioError:REQUEST_NOT_SUPPORTED
      */
     oneway getIccCardStatusResponse_1_4(RadioResponseInfo info, CardStatus cardStatus);
@@ -119,14 +114,11 @@
      * Valid errors returned:
      *   RadioError:NONE
      *   RadioError:RADIO_NOT_AVAILABLE
-     *   RadioError:NO_MEMORY
      *   RadioError:INTERNAL_ERR
-     *   RadioError:SYSTEM_ERR
      *   RadioError:INVALID_ARGUMENTS
      *   RadioError:MODEM_ERR
      *   RadioError:REQUEST_NOT_SUPPORTED
      *   RadioError:NO_RESOURCES
-     *   RadioError:CANCELLED
      */
     oneway getPreferredNetworkTypeBitmapResponse(RadioResponseInfo info,
             bitfield<RadioAccessFamily> networkTypeBitmap);
@@ -141,14 +133,11 @@
      *   RadioError:RADIO_NOT_AVAILABLE
      *   RadioError:OPERATION_NOT_ALLOWED
      *   RadioError:MODE_NOT_SUPPORTED
-     *   RadioError:NO_MEMORY
      *   RadioError:INTERNAL_ERR
-     *   RadioError:SYSTEM_ERR
      *   RadioError:INVALID_ARGUMENTS
      *   RadioError:MODEM_ERR
      *   RadioError:REQUEST_NOT_SUPPORTED
      *   RadioError:NO_RESOURCES
-     *   RadioError:CANCELLED
      */
     oneway setPreferredNetworkTypeBitmapResponse(RadioResponseInfo info);
 
@@ -160,9 +149,7 @@
      *   RadioError:NONE
      *   RadioError:RADIO_NOT_AVAILABLE
      *   RadioError:INTERNAL_ERR
-     *   RadioError:NO_MEMORY
      *   RadioError:NO_RESOURCES
-     *   RadioError:CANCELLED
      *   RadioError:REQUEST_NOT_SUPPORTED
      *   RadioError:SIM_ABSENT
      */
@@ -182,9 +169,7 @@
      *   RadioError:REQUEST_NOT_SUPPORTED
      *   RadioError:INVALID_ARGUMENTS
      *   RadioError:INTERNAL_ERR
-     *   RadioError:NO_MEMORY
      *   RadioError:NO_RESOURCES
-     *   RadioError:CANCELLED
      *   RadioError:SIM_ABSENT
      */
     oneway setupDataCallResponse_1_4(RadioResponseInfo info, SetupDataCallResult dcResponse);
diff --git a/radio/1.4/types.hal b/radio/1.4/types.hal
index 76e8403..6fa7ebd 100644
--- a/radio/1.4/types.hal
+++ b/radio/1.4/types.hal
@@ -230,7 +230,7 @@
      * Network has already initiated the activation, modification, or deactivation of bearer
      * resources that was requested by the UE.
      */
-    COLLISION_WITH_NW_INIT_REQ = 0x38,
+    COLLISION_WITH_NETWORK_INITIATED_REQUEST = 0x38,
     /**
      * Network supports IPv4v6 PDP type only. Non-IP type is not allowed. In LTE mode of operation,
      * this is a PDN throttling cause code, meaning the UE may throttle further requests to the
@@ -244,7 +244,7 @@
      */
     ONLY_NON_IP_ALLOWED = 0x3A,
     /**
-     * QCI indicated in the UE request cannot be supported.
+     * QCI (QoS Class Identifier) indicated in the UE request cannot be supported.
      */
     UNSUPPORTED_QCI_VALUE = 0x3B,
     /**
@@ -258,7 +258,7 @@
     /**
      * Not receiving either a PCSCF or a DNS address, one of them being mandatory.
      */
-    INVALID_PCSCF_DNS_ADDR = 0x7C,
+    INVALID_PCSCF_OR_DNS_ADDRESS = 0x7C,
     /**
      * Emergency call bring up on a different ePDG.
      */
@@ -266,128 +266,136 @@
     /**
      * UE performs a detach or disconnect PDN action based on TE requirements.
      */
-    UE_INIT_DETACH_OR_DISCONNECT = 0x80,
+    UE_INITIATED_DETACH_OR_DISCONNECT = 0x80,
 
     /**
-     * Reason unspecified for foreign agent rejected MIP registration.
+     * Reason unspecified for foreign agent rejected MIP (Mobile IP) registration.
      */
     MIP_FA_REASON_UNSPECIFIED = 0x7D0,
     /**
-     * Foreign agent administratively prohibited MIP registration.
+     * Foreign agent administratively prohibited MIP (Mobile IP) registration.
      */
     MIP_FA_ADMIN_PROHIBITED = 0x7D1,
     /**
-     * Foreign agent rejected MIP registration because of insufficient resources.
+     * Foreign agent rejected MIP (Mobile IP) registration because of insufficient resources.
      */
     MIP_FA_INSUFFICIENT_RESOURCES = 0x7D2,
     /**
-     * Foreign agent rejected MIP registration because of MN-AAA authenticator was wrong.
+     * Foreign agent rejected MIP (Mobile IP) registration because of MN-AAA authenticator was
+     * wrong.
      */
-    MIP_FA_MOBILE_NODE_AUTH_FAILURE = 0x7D3,
+    MIP_FA_MOBILE_NODE_AUTHENTICATION_FAILURE = 0x7D3,
     /**
-     * Foreign agent rejected MIP registration because of home agent authentication failure.
+     * Foreign agent rejected MIP (Mobile IP) registration because of home agent authentication
+     * failure.
      */
-    MIP_FA_HA_AUTH_FAILURE = 0x7D4,
+    MIP_FA_HOME_AGENT_AUTHENTICATION_FAILURE = 0x7D4,
     /**
-     * Foreign agent rejected MIP registration because of requested lifetime was too long.
+     * Foreign agent rejected MIP (Mobile IP) registration because of requested lifetime was too
+     * long.
      */
-    MIP_FA_REQ_LIFETIME_TOO_LONG = 0x7D5,
+    MIP_FA_REQUESTED_LIFETIME_TOO_LONG = 0x7D5,
     /**
-     * Foreign agent rejected MIP registration because of malformed request.
+     * Foreign agent rejected MIP (Mobile IP) registration because of malformed request.
      */
     MIP_FA_MALFORMED_REQUEST = 0x7D6,
     /**
-     * Foreign agent rejected MIP registration because of malformed reply.
+     * Foreign agent rejected MIP (Mobile IP) registration because of malformed reply.
      */
     MIP_FA_MALFORMED_REPLY = 0x7D7,
     /**
-     * Foreign agent rejected MIP registration because of requested encapsulation was unavailable.
+     * Foreign agent rejected MIP (Mobile IP) registration because of requested encapsulation was
+     * unavailable.
      */
     MIP_FA_ENCAPSULATION_UNAVAILABLE = 0x7D8,
     /**
-     * Foreign agent rejected MIP registration of VJ Header Compression was unavailable.
+     * Foreign agent rejected MIP (Mobile IP) registration of VJ Header Compression was unavailable.
      */
-    MIP_FA_VJHC_UNAVAILABLE = 0x7D9,
+    MIP_FA_VJ_HEADER_COMPRESSION_UNAVAILABLE = 0x7D9,
     /**
-     * Foreign agent rejected MIP registration because of reverse tunnel was unavailable.
+     * Foreign agent rejected MIP (Mobile IP) registration because of reverse tunnel was
+     * unavailable.
      */
-    MIP_FA_REV_TUNNEL_UNAVAILABLE = 0x7DA,
+    MIP_FA_REVERSE_TUNNEL_UNAVAILABLE = 0x7DA,
     /**
-     * Foreign agent rejected MIP registration because of reverse tunnel was mandatory but not
-     * requested by device.
+     * Foreign agent rejected MIP (Mobile IP) registration because of reverse tunnel was mandatory
+     * but not requested by device.
      */
-    MIP_FA_REV_TUNNEL_IS_MAND_AND_T_BIT_NOT_SET = 0x7DB,
+    MIP_FA_REVERSE_TUNNEL_IS_MANDATORY = 0x7DB,
     /**
-     * Foreign agent rejected MIP registration because of delivery style was not supported.
+     * Foreign agent rejected MIP (Mobile IP) registration because of delivery style was not
+     * supported.
      */
-    MIP_FA_DELIVERY_STYLE_NOT_SUPP = 0x7DC,
+    MIP_FA_DELIVERY_STYLE_NOT_SUPPORTED = 0x7DC,
     /**
-     * Foreign agent rejected MIP registration because of missing NAI.
+     * Foreign agent rejected MIP (Mobile IP) registration because of missing NAI (Network Access
+     * Identifier).
      */
     MIP_FA_MISSING_NAI = 0x7DD,
     /**
-     * Foreign agent rejected MIP registration because of missing Home Agent.
+     * Foreign agent rejected MIP (Mobile IP) registration because of missing Home Agent.
      */
-    MIP_FA_MISSING_HA = 0x7DE,
+    MIP_FA_MISSING_HOME_AGENT = 0x7DE,
     /**
-     * Foreign agent rejected MIP registration because of missing Home Address.
+     * Foreign agent rejected MIP (Mobile IP) registration because of missing Home Address.
      */
-    MIP_FA_MISSING_HOME_ADDR = 0x7DF,
+    MIP_FA_MISSING_HOME_ADDRESS = 0x7DF,
     /**
-     * Foreign agent rejected MIP registration because of unknown challenge.
+     * Foreign agent rejected MIP (Mobile IP) registration because of unknown challenge.
      */
     MIP_FA_UNKNOWN_CHALLENGE = 0x7E0,
     /**
-     * Foreign agent rejected MIP registration because of missing challenge.
+     * Foreign agent rejected MIP (Mobile IP) registration because of missing challenge.
      */
     MIP_FA_MISSING_CHALLENGE = 0x7E1,
     /**
-     * Foreign agent rejected MIP registration because of stale challenge.
+     * Foreign agent rejected MIP (Mobile IP) registration because of stale challenge.
      */
     MIP_FA_STALE_CHALLENGE = 0x7E2,
     /**
-     * Reason unspecified for home agent rejected MIP registration.
+     * Reason unspecified for home agent rejected MIP (Mobile IP) registration.
      */
     MIP_HA_REASON_UNSPECIFIED = 0x7E3,
     /**
-     * Home agent administratively prohibited MIP registration.
+     * Home agent administratively prohibited MIP (Mobile IP) registration.
      */
     MIP_HA_ADMIN_PROHIBITED = 0x7E4,
     /**
-     * Home agent rejected MIP registration because of insufficient resources.
+     * Home agent rejected MIP (Mobile IP) registration because of insufficient resources.
      */
     MIP_HA_INSUFFICIENT_RESOURCES = 0x7E5,
     /**
-     * Home agent rejected MIP registration because of MN-HA authenticator was wrong.
+     * Home agent rejected MIP (Mobile IP) registration because of MN-HA authenticator was wrong.
      */
-    MIP_HA_MOBILE_NODE_AUTH_FAILURE = 0x7E6,
+    MIP_HA_MOBILE_NODE_AUTHENTICATION_FAILURE = 0x7E6,
     /**
-     * Home agent rejected MIP registration because of foreign agent authentication failure.
+     * Home agent rejected MIP (Mobile IP) registration because of foreign agent authentication
+     * failure.
      */
-    MIP_HA_FA_AUTH_FAILURE = 0x7E7,
+    MIP_HA_FOREIGN_AGENT_AUTHENTICATION_FAILURE = 0x7E7,
     /**
-     * Home agent rejected MIP registration because of registration id mismatch.
+     * Home agent rejected MIP (Mobile IP) registration because of registration id mismatch.
      */
     MIP_HA_REGISTRATION_ID_MISMATCH = 0x7E8,
     /**
-     * Home agent rejected MIP registration because of malformed request.
+     * Home agent rejected MIP (Mobile IP) registration because of malformed request.
      */
     MIP_HA_MALFORMED_REQUEST = 0x7E9,
     /**
-     * Home agent rejected MIP registration because of unknown home agent address.
+     * Home agent rejected MIP (Mobile IP) registration because of unknown home agent address.
      */
-    MIP_HA_UNKNOWN_HA_ADDR = 0x7EA,
+    MIP_HA_UNKNOWN_HOME_AGENT_ADDRESS = 0x7EA,
     /**
-     * Home agent rejected MIP registration because of reverse tunnel was unavailable.
+     * Home agent rejected MIP (Mobile IP) registration because of reverse tunnel was unavailable.
      */
-    MIP_HA_REV_TUNNEL_UNAVAILABLE = 0x7EB,
+    MIP_HA_REVERSE_TUNNEL_UNAVAILABLE = 0x7EB,
     /**
-     * Home agent rejected MIP registration because of reverse tunnel is mandatory but not
-     * requested by device.
+     * Home agent rejected MIP (Mobile IP) registration because of reverse tunnel is mandatory but
+     * not requested by device.
      */
-    MIP_HA_REV_TUNNEL_IS_MANDATORY_AND_T_BIT_NOT_SET = 0x7EC,
+    MIP_HA_REVERSE_TUNNEL_IS_MANDATORY = 0x7EC,
     /**
-     * Home agent rejected MIP registration because of encapsulation unavailable.
+     * Home agent rejected MIP (Mobile IP) registration because of encapsulation unavailable.
      */
     MIP_HA_ENCAPSULATION_UNAVAILABLE = 0x7ED,
     /**
@@ -397,29 +405,29 @@
     /**
      * Brought down by the network.
      */
-    NW_INITIATED_TERMINATION = 0x7EF,
+    NETWORK_INITIATED_TERMINATION = 0x7EF,
     /**
      * Another application in modem preempts the data call.
      */
     MODEM_APP_PREEMPTED = 0x7F0,
     /**
-     * V4 PDN is in throttled state due to network providing only V6 address during the previous
+     * IPV4 PDN is in throttled state due to network providing only IPV6 address during the previous
      * VSNCP bringup (subs_limited_to_v6).
      */
-    ERR_PDN_IPV4_CALL_DISALLOWED = 0x7F1,
+    PDN_IPV4_CALL_DISALLOWED = 0x7F1,
     /**
-     * V4 PDN is in throttled state due to previous VSNCP bringup failure(s).
+     * IPV4 PDN is in throttled state due to previous VSNCP bringup failure(s).
      */
-    ERR_PDN_IPV4_CALL_THROTTLED = 0x7F2,
+    PDN_IPV4_CALL_THROTTLED = 0x7F2,
     /**
-     * V6 PDN is in throttled state due to network providing only V4 address during the previous
+     * IPV6 PDN is in throttled state due to network providing only IPV4 address during the previous
      * VSNCP bringup (subs_limited_to_v4).
      */
-    ERR_PDN_IPV6_CALL_DISALLOWED = 0x7F3,
+    PDN_IPV6_CALL_DISALLOWED = 0x7F3,
     /**
-     * V6 PDN is in throttled state due to previous VSNCP bringup failure(s).
+     * IPV6 PDN is in throttled state due to previous VSNCP bringup failure(s).
      */
-    ERR_PDN_IPV6_CALL_THROTTLED = 0x7F4,
+    PDN_IPV6_CALL_THROTTLED = 0x7F4,
     /**
      * Modem restart.
      */
@@ -435,7 +443,7 @@
     /**
      * Physical link is in the process of cleanup.
      */
-    PHYS_LINK_CLOSE_IN_PROGRESS = 0x7F8,
+    PHYSICAL_LINK_CLOSE_IN_PROGRESS = 0x7F8,
     /**
      * Interface bring up is attempted for an APN that is yet to be handed over to target RAT.
      */
@@ -447,11 +455,11 @@
     /**
      * Card was refreshed or removed.
      */
-    SIM_CARD_EVT = 0x7FB,
+    SIM_CARD_CHANGED = 0x7FB,
     /**
      * Device is going into lower power mode or powering down.
      */
-    LPM_OR_PWR_DOWN = 0x7FC,
+    LOW_POWER_MODE_OR_POWERING_DOWN = 0x7FC,
     /**
      * APN has been disabled.
      */
@@ -463,7 +471,7 @@
     /**
      * IPv6 address transfer failed.
      */
-    IPV6_ADDR_TRANSFER_FAILED = 0x7FF,
+    IPV6_ADDRESS_TRANSFER_FAILED = 0x7FF,
     /**
      * Target RAT swap failed.
      */
@@ -485,12 +493,12 @@
      * IPv4 data call bring up is rejected because the UE already maintains the allotted maximum
      * number of IPv4 data connections.
      */
-    MAX_V4_CONNECTIONS = 0x804,
+    MAX_IPV4_CONNECTIONS = 0x804,
     /**
      * IPv6 data call bring up is rejected because the UE already maintains the allotted maximum
      * number of IPv6 data connections.
      */
-    MAX_V6_CONNECTIONS = 0x805,
+    MAX_IPV6_CONNECTIONS = 0x805,
     /**
      * New PDN bring up is rejected during interface selection because the UE has already allotted
      * the available interfaces for other PDNs.
@@ -512,835 +520,834 @@
     /**
      * The current interface is being in use.
      */
-    IFACE_IN_USE = 0x80A,
+    INTERFACE_IN_USE = 0x80A,
     /**
      * PDN connection to the APN is disallowed on the roaming network.
      */
-    APN_DISALLOWED_ON_ROAMING = 0x80C,
+    APN_DISALLOWED_ON_ROAMING = 0x80B,
     /**
      * APN-related parameters are changed.
      */
-    APN_PARAM_CHANGED = 0x80D,
+    APN_PARAMETERS_CHANGED = 0x80C,
     /**
      * PDN is attempted to be brought up with NULL APN but NULL APN is not supported.
      */
-    NULL_APN_DISALLOWED = 0x80E,
+    NULL_APN_DISALLOWED = 0x80D,
     /**
      * Thermal level increases and causes calls to be torn down when normal mode of operation is
      * not allowed.
      */
-    THERMAL_MITIGATION = 0x80F,
+    THERMAL_MITIGATION = 0x80E,
     /**
      * PDN Connection to a given APN is disallowed because data is disabled from the device user
      * interface settings.
      */
-    DATA_SETTINGS_DISABLED = 0x810,
+    DATA_SETTINGS_DISABLED = 0x80F,
     /**
      * PDN Connection to a given APN is disallowed because data roaming is disabled from the device
      * user interface settings and the UE is roaming.
      */
-    DATA_ROAMING_SETTINGS_DISABLED = 0x811,
+    DATA_ROAMING_SETTINGS_DISABLED = 0x810,
     /**
-     * Default data subscription switch occurs.
+     * DDS (Default data subscription) switch occurs.
      */
-    DDS_CALL_ABORT = 0x812,
+    DDS_SWITCHED = 0x811,
     /**
      * PDN being brought up with an APN that is part of forbidden APN Name list.
      */
-    INVALID_APN_NAME = 0x813,
+    FORBIDDEN_APN_NAME = 0x812,
     /**
      * Default data subscription switch is in progress.
      */
-    DDS_SWITCH_IN_PROGRESS = 0x814,
+    DDS_SWITCH_IN_PROGRESS = 0x813,
     /**
      * Roaming is disallowed during call bring up.
      */
-    CALL_DISALLOWED_IN_ROAMING = 0x815,
+    CALL_DISALLOWED_IN_ROAMING = 0x814,
     /**
      * UE is unable to bring up a non-IP data call because the device is not camped on a NB1 cell.
      */
-    NON_IP_NOT_SUPPORTED = 0x816,
+    NON_IP_NOT_SUPPORTED = 0x815,
     /**
      * Non-IP PDN is in throttled state due to previous VSNCP bringup failure(s).
      */
-    ERR_PDN_NON_IP_CALL_THROTTLED = 0x817,
+    PDN_NON_IP_CALL_THROTTLED = 0x816,
     /**
      * Non-IP PDN is in disallowed state due to the network providing only an IP address.
      */
-    ERR_PDN_NON_IP_CALL_DISALLOWED = 0x818,
+    PDN_NON_IP_CALL_DISALLOWED = 0x817,
     /**
      * Device in CDMA locked state.
      */
-    CDMA_LOCK = 0x819,
+    CDMA_LOCK = 0x818,
     /**
      * Received an intercept order from the base station.
      */
-    CDMA_INTERCEPT = 0x81A,
+    CDMA_INTERCEPT = 0x819,
     /**
      * Receiving a reorder from the base station.
      */
-    CDMA_REORDER = 0x81B,
+    CDMA_REORDER = 0x81A,
     /**
-     * Receiving a release from the base station with a SO Reject reason.
+     * Receiving a release from the base station with a SO (Service Option) Reject reason.
      */
-    CDMA_REL_SO_REJ = 0x81C,
+    CDMA_RELEASE_DUE_TO_SO_REJECTION = 0x81B,
     /**
      * Receiving an incoming call from the base station.
      */
-    CDMA_INCOM_CALL = 0x81D,
+    CDMA_INCOMING_CALL = 0x81C,
     /**
-     * RL/FL fade or receiving a call release from the base station.
+     * Received an alert stop from the base station due to incoming only.
      */
-    CDMA_ALERT_STOP = 0x81E,
+    CDMA_ALERT_STOP = 0x81D,
     /**
      * Channel acquisition failures. This indicates that device has failed acquiring all the
      * channels in the PRL.
      */
-    CHANNEL_ACQUISITION_FAILURE = 0x81F,
+    CHANNEL_ACQUISITION_FAILURE = 0x81E,
     /**
      * Maximum access probes transmitted.
      */
-    MAX_ACCESS_PROBE = 0x820,
+    MAX_ACCESS_PROBE = 0x81F,
     /**
      * Concurrent service is not supported by base station.
      */
-    CCS_NOT_SUPPORTED_BY_BS = 0x821,
+    CONCURRENT_SERVICE_NOT_SUPPORTED_BY_BASE_STATION = 0x820,
     /**
      * There was no response received from the base station.
      */
-    NO_RESPONSE_FROM_BS = 0x822,
+    NO_RESPONSE_FROM_BASE_STATION = 0x821,
     /**
      * The base station rejecting the call.
      */
-    REJECTED_BY_BS = 0x823,
+    REJECTED_BY_BASE_STATION = 0x822,
     /**
      * The concurrent services requested were not compatible.
      */
-    CCS_INCOMPATIBLE = 0x824,
+    CONCURRENT_SERVICES_INCOMPATIBLE = 0x823,
     /**
      * Device does not have CDMA service.
      */
-    NO_CDMA_SRV = 0x825,
+    NO_CDMA_SERVICE = 0x824,
     /**
      * RUIM not being present.
      */
-    UIM_NOT_PRESENT = 0x826,
+    RUIM_NOT_PRESENT = 0x825,
     /**
      * Receiving a retry order from the base station.
      */
-    CDMA_RETRY_ORDER = 0x827,
+    CDMA_RETRY_ORDER = 0x826,
     /**
      * Access blocked by the base station.
      */
-    ACCESS_BLOCK = 0x828,
+    ACCESS_BLOCK = 0x827,
     /**
      * Access blocked by the base station for all mobile devices.
      */
-    ACCESS_BLOCK_ALL = 0x829,
+    ACCESS_BLOCK_ALL = 0x828,
     /**
      * Maximum access probes for the IS-707B call.
      */
-    IS707B_MAX_ACC = 0x82A,
+    IS707B_MAX_ACCESS_PROBES = 0x829,
     /**
      * Put device in thermal emergency.
      */
-    THERMAL_EMERGENCY = 0x82B,
+    THERMAL_EMERGENCY = 0x82A,
     /**
      * In favor of a voice call or SMS when concurrent voice and data are not supported.
      */
-    CCS_NOT_ALLOWED = 0x82C,
+    CONCURRENT_SERVICES_NOT_ALLOWED = 0x82B,
     /**
      * The other clients rejected incoming call.
      */
-    INCOM_REJ = 0x82D,
+    INCOMING_CALL_REJECTED = 0x82C,
     /**
      * No service on the gateway.
      */
-    NO_GATEWAY_SRV = 0x82E,
+    NO_SERVICE_ON_GATEWAY = 0x82D,
     /**
      * GPRS context is not available.
      */
-    NO_GPRS_CONTEXT = 0x82F,
+    NO_GPRS_CONTEXT = 0x82E,
     /**
      * Network refuses service to the MS because either an identity of the MS is not acceptable to
      * the network or the MS does not pass the authentication check.
      */
-    ILLEGAL_MS = 0x830,
+    ILLEGAL_MS = 0x82F,
     /**
      * ME could not be authenticated and the ME used is not acceptable to the network.
      */
-    ILLEGAL_ME = 0x831,
+    ILLEGAL_ME = 0x830,
     /**
      * Not allowed to operate either GPRS or non-GPRS services.
      */
-    GPRS_SERVICES_AND_NON_GPRS_SERVICES_NOT_ALLOWED = 0x832,
+    GPRS_SERVICES_AND_NON_GPRS_SERVICES_NOT_ALLOWED = 0x831,
     /**
      * MS is not allowed to operate GPRS services.
      */
-    GPRS_SERVICES_NOT_ALLOWED = 0x833,
+    GPRS_SERVICES_NOT_ALLOWED = 0x832,
     /**
      * No matching identity or context could be found in the network.
      */
-    MS_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK = 0x834,
+    MS_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK = 0x833,
     /**
-     * Mobile reachable timer has expired, or the GMM context data related to the subscription dose
+     * Mobile reachable timer has expired, or the GMM context data related to the subscription does
      * not exist in the SGSN.
      */
-    IMPLICITLY_DETACHED = 0x835,
+    IMPLICITLY_DETACHED = 0x834,
     /**
      * UE requests GPRS service, or the network initiates a detach request in a PLMN which does not
      * offer roaming for GPRS services to that MS.
      */
-    PLMN_NOT_ALLOWED = 0x836,
+    PLMN_NOT_ALLOWED = 0x835,
     /**
      * MS requests service, or the network initiates a detach request, in a location area where the
      * HPLMN determines that the MS, by subscription, is not allowed to operate.
      */
-    LA_NOT_ALLOWED = 0x837,
+    LOCATION_AREA_NOT_ALLOWED = 0x836,
     /**
      * UE requests GPRS service or the network initiates a detach request in a PLMN that does not
      * offer roaming for GPRS services.
      */
-    GPRS_SERVICES_NOT_ALLOWED_IN_THIS_PLMN = 0x838,
+    GPRS_SERVICES_NOT_ALLOWED_IN_THIS_PLMN = 0x837,
     /**
      * PDP context already exists.
      */
-    PDP_DUPLICATE = 0x839,
+    PDP_DUPLICATE = 0x838,
     /**
      * RAT change on the UE.
      */
-    UE_RAT_CHANGE = 0x83A,
+    UE_RAT_CHANGE = 0x839,
     /**
      * Network cannot serve a request from the MS due to congestion.
      */
-    CONGESTION = 0x83B,
+    CONGESTION = 0x83A,
     /**
      * MS requests an establishment of the radio access bearers for all active PDP contexts by
      * sending a service request message indicating data to the network, but the SGSN does not have
      * any active PDP context.
      */
-    NO_PDP_CONTEXT_ACTIVATED = 0x83C,
+    NO_PDP_CONTEXT_ACTIVATED = 0x83B,
     /**
      * Access class blocking restrictions for the current camped cell.
      */
-    ACCESS_CLASS_DSAC_REJECTION = 0x83D,
+    ACCESS_CLASS_DSAC_REJECTION = 0x83C,
     /**
      * SM attempts PDP activation for a maximum of four attempts.
      */
-    PDP_ACTIVATE_MAX_RETRY_FAILED = 0x83E,
+    PDP_ACTIVATE_MAX_RETRY_FAILED = 0x83D,
     /**
      * Radio access bearer failure.
      */
-    RAB_FAILURE = 0x83F,
+    RADIO_ACCESS_BEARER_FAILURE = 0x83E,
     /**
      * Invalid EPS bearer identity in the request.
      */
-    ESM_UNKNOWN_EPS_BEARER_CONTEXT = 0x840,
+    ESM_UNKNOWN_EPS_BEARER_CONTEXT = 0x83F,
     /**
      * Data radio bearer is released by the RRC.
      */
-    DRB_RELEASED_AT_RRC = 0x841,
+    DRB_RELEASED_BY_RRC = 0x840,
     /**
      * Indicate the connection was released.
      */
-    NAS_SIG_CONN_RELEASED = 0x842,
+    CONNECTION_RELEASED = 0x841,
     /**
      * UE is detached.
      */
-    EMM_DETACHED = 0x843,
+    EMM_DETACHED = 0x842,
     /**
      * Attach procedure is rejected by the network.
      */
-    EMM_ATTACH_FAILED = 0x844,
+    EMM_ATTACH_FAILED = 0x843,
     /**
      * Attach procedure is started for EMC purposes.
      */
-    EMM_ATTACH_STARTED = 0x845,
+    EMM_ATTACH_STARTED = 0x844,
     /**
      * Service request procedure failure.
      */
-    LTE_NAS_SERVICE_REQ_FAILED = 0x846,
+    LTE_NAS_SERVICE_REQUEST_FAILED = 0x845,
     /**
-     * Active dedication bearer was requested using the same default bearer ID.
+     * Active dedicated bearer was requested using the same default bearer ID.
      */
-    ESM_ACTIVE_DEDICATED_BEARER_REACTIVATED_BY_NW = 0x847,
+    DUPLICATE_BEARER_ID = 0x846,
     /**
      * Collision scenarios for the UE and network-initiated procedures.
      */
-    ESM_LOWER_LAYER_FAILURE = 0x848,
+    ESM_COLLISION_SCENARIOS = 0x847,
     /**
      * Bearer must be deactivated to synchronize with the network.
      */
-    ESM_SYNC_UP_WITH_NW = 0x849,
+    ESM_BEARER_DEACTIVATED_TO_SYNC_WITH_NETWORK = 0x848,
     /**
-     * Active dedication bearer was requested for an existing default bearer.
+     * Active dedicated bearer was requested for an existing default bearer.
      */
-    ESM_NW_ACTIVATED_DED_BEARER_WITH_ID_OF_DEF_BEARER = 0x84A,
+    ESM_NW_ACTIVATED_DED_BEARER_WITH_ID_OF_DEF_BEARER = 0x849,
     /**
      * Bad OTA message is received from the network.
      */
-    ESM_BAD_OTA_MESSAGE = 0x84B,
+    ESM_BAD_OTA_MESSAGE = 0x84A,
     /**
      * Download server rejected the call.
      */
-    ESM_DS_REJECTED_THE_CALL = 0x84C,
+    ESM_DOWNLOAD_SERVER_REJECTED_THE_CALL = 0x84B,
     /**
      * PDN was disconnected by the downlaod server due to IRAT.
      */
-    ESM_CONTEXT_TRANSFERED_DUE_TO_IRAT = 0x84D,
+    ESM_CONTEXT_TRANSFERRED_DUE_TO_IRAT = 0x84C,
     /**
      * Dedicated bearer will be deactivated regardless of the network response.
      */
-    DS_EXPLICIT_DEACT = 0x84E,
+    DS_EXPLICIT_DEACTIVATION = 0x84D,
     /**
      * No specific local cause is mentioned, usually a valid OTA cause.
      */
-    ESM_LOCAL_CAUSE_NONE = 0x84F,
+    ESM_LOCAL_CAUSE_NONE = 0x84E,
     /**
      * Throttling is not needed for this service request failure.
      */
-    LTE_NAS_SERVICE_REQ_FAILED_NO_THROTTLE = 0x850,
+    LTE_THROTTLING_NOT_REQUIRED = 0x84F,
     /**
      * Access control list check failure at the lower layer.
      */
-    ACCESS_CONTROL_LIST_CHECK_FAILURE = 0x851,
+    ACCESS_CONTROL_LIST_CHECK_FAILURE = 0x850,
     /**
      * Service is not allowed on the requested PLMN.
      */
-    LTE_NAS_SERVICE_REQ_FAILED_DS_DISALLOW = 0x852,
+    SERVICE_NOT_ALLOWED_ON_PLMN = 0x851,
     /**
      * T3417 timer expiration of the service request procedure.
      */
-    EMM_T3417_EXPIRED = 0x853,
+    EMM_T3417_EXPIRED = 0x852,
     /**
      * Extended service request fails due to expiration of the T3417 EXT timer.
      */
-    EMM_T3417_EXT_EXPIRED = 0x854,
+    EMM_T3417_EXT_EXPIRED = 0x853,
     /**
-     * Transmission failure of uplink data.
+     * Transmission failure of radio resource control (RRC) uplink data.
      */
-    LRRC_UL_DATA_CNF_FAILURE_TXN = 0x855,
+    RRC_UPLINK_DATA_TRANSMISSION_FAILURE = 0x854,
     /**
-     * Uplink data delivery failed due to a handover.
+     * Radio resource control (RRC) uplink data delivery failed due to a handover.
      */
-    LRRC_UL_DATA_CNF_FAILURE_HO = 0x856,
+    RRC_UPLINK_DELIVERY_FAILED_DUE_TO_HANDOVER = 0x855,
     /**
-     * Uplink data delivery failed due to a connection release.
+     * Radio resource control (RRC) uplink data delivery failed due to a connection release.
      */
-    LRRC_UL_DATA_CNF_FAILURE_CONN_REL = 0x857,
+    RRC_UPLINK_CONNECTION_RELEASE = 0x856,
     /**
-     * Uplink data delivery failed due to a radio link failure.
+     * Radio resource control (RRC) uplink data delivery failed due to a radio link failure.
      */
-    LRRC_UL_DATA_CNF_FAILURE_RLF = 0x858,
+    RRC_UPLINK_RADIO_LINK_FAILURE = 0x857,
     /**
-     * RRC is not connected but the NAS sends an uplink data request.
+     * Radio resource control (RRC) is not connected but the non-access stratum (NAS) sends an
+     * uplink data request.
      */
-    LRRC_UL_DATA_CNF_FAILURE_CTRL_NOT_CONN = 0x859,
+    RRC_UPLINK_ERROR_REQUEST_FROM_NAS = 0x858,
     /**
-     * Connection failure at access stratum.
+     * Radio resource control (RRC) connection failure at access stratum.
      */
-    LRRC_CONN_EST_FAILURE = 0x85A,
+    RRC_CONNECTION_ACCESS_STRATUM_FAILURE = 0x859,
     /**
-     * Connection establishment is aborted due to another procedure.
+     * Radio resource control (RRC) connection establishment is aborted due to another procedure.
      */
-    LRRC_CONN_EST_FAILURE_ABORTED = 0x85B,
+    RRC_CONNECTION_ANOTHER_PROCEDURE_IN_PROGRESS = 0x85A,
     /**
-     * Connection establishment failed due to a lower layer RRC connection failure.
+     * Radio resource control (RRC) connection establishment failed due to access barrred.
      */
-    LRRC_CONN_EST_FAILURE_ACCESS_BARRED = 0x85C,
+    RRC_CONNECTION_ACCESS_BARRED = 0x85B,
     /**
-     * Connection establishment failed due to cell reselection at access stratum.
+     * Radio resource control (RRC) connection establishment failed due to cell reselection at
+     * access stratum.
      */
-    LRRC_CONN_EST_FAILURE_CELL_RESEL = 0x85D,
+    RRC_CONNECTION_CELL_RESELECTION = 0x85C,
     /**
-     * Connection establishment failed due to configuration failure at the RRC.
+     * Connection establishment failed due to configuration failure at the radio resource control
+     * (RRC).
      */
-    LRRC_CONN_EST_FAILURE_CONFIG_FAILURE = 0x85E,
+    RRC_CONNECTION_CONFIG_FAILURE = 0x85D,
     /**
-     * Connection could not be established in the time limit.
+     * Radio resource control (RRC) connection could not be established in the time limit.
      */
-    LRRC_CONN_EST_FAILURE_TIMER_EXPIRED = 0x85F,
+    RRC_CONNECTION_TIMER_EXPIRED = 0x85E,
     /**
-     * Connection establishment failed due to a link failure at the RRC.
+     * Connection establishment failed due to a link failure at the radio resource control (RRC).
      */
-    LRRC_CONN_EST_FAILURE_LINK_FAILURE = 0x860,
+    RRC_CONNECTION_LINK_FAILURE = 0x85F,
     /**
-     * Connection establishment failed as the RRC is not camped on any cell.
+     * Connection establishment failed as the radio resource control (RRC) is not camped on any
+     * cell.
      */
-    LRRC_CONN_EST_FAILURE_NOT_CAMPED = 0x861,
+    RRC_CONNECTION_CELL_NOT_CAMPED = 0x860,
     /**
-     * Connection establishment failed due to a service interval failure at the RRC.
+     * Connection establishment failed due to a service interval failure at the radio resource
+     * control (RRC).
      */
-    LRRC_CONN_EST_FAILURE_SI_FAILURE = 0x862,
+    RRC_CONNECTION_SYSTEM_INTERVAL_FAILURE = 0x861,
     /**
-     * Connection establishment failed due to the network rejecting the UE connection request.
+     * Radio resource control (RRC) connection establishment failed due to the network rejecting the
+     * UE connection request.
      */
-    LRRC_CONN_EST_FAILURE_CONN_REJECT = 0x863,
+    RRC_CONNECTION_REJECT_BY_NETWORK = 0x862,
     /**
-     * Normal connection release.
+     * Normal radio resource control (RRC) connection release.
      */
-    LRRC_CONN_REL_NORMAL = 0x864,
+    RRC_CONNECTION_NORMAL_RELEASE = 0x863,
     /**
-     * Connection release failed due to radio link failure conditions.
+     * Radio resource control (RRC) connection release failed due to radio link failure conditions.
      */
-    LRRC_CONN_REL_RLF = 0x865,
+    RRC_CONNECTION_RADIO_LINK_FAILURE = 0x864,
     /**
-     * Connection reestablishment failure.
+     * Radio resource control (RRC) connection re-establishment failure.
      */
-    LRRC_CONN_REL_CRE_FAILURE = 0x866,
+    RRC_CONNECTION_REESTABLISHMENT_FAILURE = 0x865,
     /**
      * UE is out of service during the call register.
      */
-    LRRC_CONN_REL_OOS_DURING_CRE = 0x867,
+    RRC_CONNECTION_OUT_OF_SERVICE_DURING_CELL_REGISTER = 0x866,
     /**
-     * Connection has been released by the RRC due to an abort request.
+     * Connection has been released by the radio resource control (RRC) due to an abort request.
      */
-    LRRC_CONN_REL_ABORTED = 0x868,
+    RRC_CONNECTION_ABORT_REQUEST = 0x867,
     /**
-     * Connection released due to a system information block read error.
+     * Radio resource control (RRC) connection released due to a system information block read
+     * error.
      */
-    LRRC_CONN_REL_SIB_READ_ERROR = 0x869,
+    RRC_CONNECTION_SYSTEM_INFORMATION_BLOCK_READ_ERROR = 0x868,
     /**
      * Network-initiated detach with reattach.
      */
-    DETACH_WITH_REATTACH_LTE_NW_DETACH = 0x86A,
+    NETWORK_INITIATED_DETACH_WITH_AUTO_REATTACH = 0x869,
     /**
      * Network-initiated detach without reattach.
      */
-    DETACH_WITHOUT_REATTACH_LTE_NW_DETACH = 0x86B,
+    NETWORK_INITIATED_DETACH_NO_AUTO_REATTACH = 0x86A,
     /**
      * ESM procedure maximum attempt timeout failure.
      */
-    ESM_PROC_TIME_OUT = 0x86C,
+    ESM_PROCEDURE_TIME_OUT = 0x86B,
     /**
      * No PDP exists with the given connection ID while modifying or deactivating or activation for
      * an already active PDP.
      */
-    INVALID_CONNECTION_ID = 0x86D,
+    INVALID_CONNECTION_ID = 0x86C,
     /**
      * Maximum NSAPIs have been exceeded during PDP activation.
      */
-    INVALID_NSAPI = 0x86E,
+    MAXIMIUM_NSAPIS_EXCEEDED = 0x86D,
     /**
      * Primary context for NSAPI does not exist.
      */
-    INVALID_PRI_NSAPI = 0x86F,
+    INVALID_PRIMARY_NSAPI = 0x86E,
     /**
      * Unable to encode the OTA message for MT PDP or deactivate PDP.
      */
-    INVALID_FIELD = 0x870,
+    CANNOT_ENCODE_OTA_MESSAGE = 0x86F,
     /**
      * Radio access bearer is not established by the lower layers during activation, modification,
      * or deactivation.
      */
-    RAB_SETUP_FAILURE = 0x871,
+    RADIO_ACCESS_BEARER_SETUP_FAILURE = 0x870,
     /**
      * Expiration of the PDP establish timer with a maximum of five retries.
      */
-    PDP_ESTABLISH_MAX_TIMEOUT = 0x872,
+    PDP_ESTABLISH_TIMEOUT_EXPIRED = 0x871,
     /**
      * Expiration of the PDP modify timer with a maximum of four retries.
      */
-    PDP_MODIFY_MAX_TIMEOUT = 0x873,
+    PDP_MODIFY_TIMEOUT_EXPIRED = 0x872,
     /**
      * Expiration of the PDP deactivate timer with a maximum of four retries.
      */
-    PDP_INACTIVE_MAX_TIMEOUT = 0x874,
+    PDP_INACTIVE_TIMEOUT_EXPIRED = 0x873,
     /**
      * PDP activation failed due to RRC_ABORT or a forbidden PLMN.
      */
-    PDP_LOWERLAYER_ERROR = 0x875,
+    PDP_LOWERLAYER_ERROR = 0x874,
     /**
      * MO PDP modify collision when the MT PDP is already in progress.
      */
-    PDP_MODIFY_COLLISION = 0x876,
-    /**
-     * Radio resource is not available.
-     */
-    SM_NO_RADIO_AVAILABLE = 0x877,
-    /**
-     * Abort due to service not available.
-     */
-    SM_ABORT_SERVICE_NOT_AVAILABLE = 0x878,
+    PDP_MODIFY_COLLISION = 0x875,
     /**
      * Maximum size of the L2 message was exceeded.
      */
-    MESSAGE_EXCEED_MAX_L2_LIMIT = 0x879,
+    MAXINUM_SIZE_OF_L2_MESSAGE_EXCEEDED = 0x876,
     /**
-     * NAS request was rejected by the network.
+     * Non-access stratum (NAS) request was rejected by the network.
      */
-    SM_NAS_SRV_REQ_FAILURE = 0x87A,
+    NAS_REQUEST_REJECTED_BY_NETWORK = 0x877,
     /**
-     * RRC connection establishment failure due to an error in the request message.
+     * Radio resource control (RRC) connection establishment failure due to an error in the request
+     * message.
      */
-    RRC_CONN_EST_FAILURE_REQ_ERROR = 0x87B,
+    RRC_CONNECTION_INVALID_REQUEST = 0x878,
     /**
-     * RRC connection establishment failure due to a change in the tracking area ID.
+     * Radio resource control (RRC) connection establishment failure due to a change in the tracking
+     * area ID.
      */
-    RRC_CONN_EST_FAILURE_TAI_CHANGE = 0x87C,
+    RRC_CONNECTION_TRACKING_AREA_ID_CHANGED = 0x879,
     /**
-     * RRC connection establishment failure because the RF was unavailable.
+     * Radio resource control (RRC) connection establishment failure due to the RF was unavailable.
      */
-    RRC_CONN_EST_FAILURE_RF_UNAVAILABLE = 0x87D,
+    RRC_CONNECTION_RF_UNAVAILABLE = 0x87A,
     /**
-     * Connection was aborted before deactivating the LTE stack due to a successful LX IRAT.
-     * (e.g., after IRAT handovers)
+     * Radio resource control (RRC) connection was aborted before deactivating the LTE stack due to
+     * a successful LTE to WCDMA/GSM/TD-SCDMA IRAT change.
      */
-    RRC_CONN_REL_ABORTED_IRAT_SUCCESS = 0x87E,
+    RRC_CONNECTION_ABORTED_DUE_TO_IRAT_CHANGE = 0x87B,
     /**
-     * If the UE has an LTE radio link failure before security is established, the connection must
-     * be released and the UE must return to idle.
+     * If the UE has an LTE radio link failure before security is established, the radio resource
+     * control (RRC) connection must be released and the UE must return to idle.
      */
-    RRC_CONN_REL_RLF_SEC_NOT_ACTIVE = 0x87F,
+    RRC_CONNECTION_RELEASED_SECURITY_NOT_ACTIVE = 0x87C,
     /**
-     * Connection was aborted by the NAS after an IRAT to LTE IRAT handover.
+     * Radio resource control (RRC) connection was aborted by the non-access stratum (NAS) after an
+     * IRAT to LTE IRAT handover.
      */
-    RRC_CONN_REL_IRAT_TO_LTE_ABORTED = 0x880,
+    RRC_CONNECTION_ABORTED_AFTER_HANDOVER = 0x87D,
     /**
-     * Connection was aborted before deactivating the LTE stack after a successful LR IRAT cell
+     * Radio resource control (RRC) connection was aborted before deactivating the LTE stack after a
+     * successful LTE to GSM/EDGE IRAT cell change order procedure.
+     */
+    RRC_CONNECTION_ABORTED_AFTER_IRAT_CELL_CHANGE = 0x87E,
+    /**
+     * Radio resource control (RRC) connection was aborted in the middle of a LTE to GSM IRAT cell
      * change order procedure.
      */
-    RRC_CONN_REL_IRAT_FROM_LTE_TO_G_CCO_SUCCESS = 0x881,
-    /**
-     * Connection was aborted in the middle of a LG IRAT cell change order.
-     */
-    RRC_CONN_REL_IRAT_FROM_LTE_TO_G_CCO_ABORTED = 0x882,
+    RRC_CONNECTION_ABORTED_DURING_IRAT_CELL_CHANGE = 0x87F,
     /**
      * IMSI present in the UE is unknown in the home subscriber server.
      */
-    IMSI_UNKNOWN_IN_HSS = 0x883,
+    IMSI_UNKNOWN_IN_HOME_SUBSCRIBER_SERVER = 0x880,
     /**
      * IMEI of the UE is not accepted by the network.
      */
-    IMEI_NOT_ACCEPTED = 0x884,
+    IMEI_NOT_ACCEPTED = 0x881,
     /**
      * EPS and non-EPS services are not allowed by the network.
      */
-    EPS_SERVICES_AND_NON_EPS_SERVICES_NOT_ALLOWED = 0x885,
+    EPS_SERVICES_AND_NON_EPS_SERVICES_NOT_ALLOWED = 0x882,
     /**
      * EPS services are not allowed in the PLMN.
      */
-    EPS_SERVICES_NOT_ALLOWED_IN_PLMN = 0x886,
+    EPS_SERVICES_NOT_ALLOWED_IN_PLMN = 0x883,
     /**
      * Mobile switching center is temporarily unreachable.
      */
-    MSC_TEMPORARILY_NOT_REACHABLE = 0x887,
+    MSC_TEMPORARILY_NOT_REACHABLE = 0x884,
     /**
      * CS domain is not available.
      */
-    CS_DOMAIN_NOT_AVAILABLE = 0x888,
+    CS_DOMAIN_NOT_AVAILABLE = 0x885,
     /**
      * ESM level failure.
      */
-    ESM_FAILURE = 0x889,
+    ESM_FAILURE = 0x886,
     /**
      * MAC level failure.
      */
-    MAC_FAILURE = 0x88A,
+    MAC_FAILURE = 0x887,
     /**
      * Synchronization failure.
      */
-    SYNCH_FAILURE = 0x88B,
+    SYNCHRONIZATION_FAILURE = 0x888,
     /**
      * UE security capabilities mismatch.
      */
-    UE_SECURITY_CAPABILITIES_MISMATCH = 0x88C,
+    UE_SECURITY_CAPABILITIES_MISMATCH = 0x889,
     /**
      * Unspecified security mode reject.
      */
-    SECURITY_MODE_REJ_UNSPECIFIED = 0x88D,
+    SECURITY_MODE_REJECTED = 0x88A,
     /**
      * Unacceptable non-EPS authentication.
      */
-    NON_EPS_AUTH_UNACCEPTABLE = 0x88E,
+    UNACCEPTABLE_NON_EPS_AUTHENTICATION = 0x88B,
     /**
      * CS fallback call establishment is not allowed.
      */
-    CS_FALLBACK_CALL_EST_NOT_ALLOWED = 0x88F,
+    CS_FALLBACK_CALL_ESTABLISHMENT_NOT_ALLOWED = 0x88C,
     /**
      * No EPS bearer context was activated.
      */
-    NO_EPS_BEARER_CONTEXT_ACTIVATED = 0x890,
+    NO_EPS_BEARER_CONTEXT_ACTIVATED = 0x88D,
     /**
      * Invalid EMM state.
      */
-    EMM_INVALID_STATE = 0x891,
+    INVALID_EMM_STATE = 0x88E,
     /**
      * Non-Access Spectrum layer failure.
      */
-    NAS_LAYER_FAILURE = 0x892,
+    NAS_LAYER_FAILURE = 0x88F,
     /**
      * Multiple PDP call feature is disabled.
      */
-    MULTI_PDN_NOT_ALLOWED = 0x893,
+    MULTIPLE_PDP_CALL_NOT_ALLOWED = 0x890,
     /**
      * Data call has been brought down because EMBMS is not enabled at the RRC layer.
      */
-    EMBMS_NOT_ENABLED = 0x894,
+    EMBMS_NOT_ENABLED = 0x891,
     /**
      * Data call was unsuccessfully transferred during the IRAT handover.
      */
-    PENDING_REDIAL_CALL_CLEANUP = 0x895,
+    IRAT_HANDOVER_FAILED = 0x892,
     /**
      * EMBMS data call has been successfully brought down.
      */
-    EMBMS_REGULAR_DEACTIVATION = 0x896,
+    EMBMS_REGULAR_DEACTIVATION = 0x893,
     /**
      * Test loop-back data call has been successfully brought down.
      */
-    TLB_REGULAR_DEACTIVATION = 0x897,
+    TEST_LOOPBACK_REGULAR_DEACTIVATION = 0x894,
     /**
      * Lower layer registration failure.
      */
-    LOWER_LAYER_REGISTRATION_FAILURE = 0x898,
+    LOWER_LAYER_REGISTRATION_FAILURE = 0x895,
     /**
-     * Network initiates a detach on LTE with error cause ""data plan has been replenished or has
-     * expired.
+     * Network initiates a detach on LTE with error cause "data plan has been replenished or has
+     * expired".
      */
-    DETACH_EPS_SERVICES_NOT_ALLOWED = 0x899,
+    DATA_PLAN_EXPIRED = 0x896,
     /**
      * UMTS interface is brought down due to handover from UMTS to iWLAN.
      */
-    SM_INTERNAL_PDP_DEACTIVATION = 0x89A,
+    UMTS_HANDOVER_TO_IWLAN = 0x897,
     /**
-     * The reception of a connection deny message with a deny code of general or network busy.
+     * Received a connection deny due to general or network busy on EVDO network.
      */
-    CD_GEN_OR_BUSY = 0x89B,
+    EVDO_CONNECTION_DENY_BY_GENERAL_OR_NETWORK_BUSY = 0x898,
     /**
-     * The reception of a connection deny message with a deny code of billing failure or
-     * authentication failure.
+     * Received a connection deny due to billing or authentication failure on EVDO network.
      */
-    CD_BILL_OR_AUTH = 0x89C,
+    EVDO_CONNECTION_DENY_BY_BILLING_OR_AUTHENTICATION_FAILURE = 0x899,
     /**
      * HDR system has been changed due to redirection or the PRL was not preferred.
      */
-    HDR_CHANGED = 0x89D,
+    EVDO_HDR_CHANGED = 0x89A,
     /**
      * Device exited HDR due to redirection or the PRL was not preferred.
      */
-    HDR_EXITED = 0x89E,
+    EVDO_HDR_EXITED = 0x89B,
     /**
      * Device does not have an HDR session.
      */
-    HDR_NO_SESSION = 0x89F,
+    EVDO_HDR_NO_SESSION = 0x89C,
     /**
      * It is ending an HDR call origination in favor of a GPS fix.
      */
-    HDR_ORIG_DURING_GPS_FIX = 0x8A0,
+    EVDO_USING_GPS_FIX_INSTEAD_OF_HDR_CALL = 0x89D,
     /**
      * Connection setup on the HDR system was time out.
      */
-    HDR_CS_TIMEOUT = 0x8A1,
+    EVDO_HDR_CONNECTION_SETUP_TIMEOUT = 0x89E,
     /**
      * Device failed to acquire a co-located HDR for origination.
      */
-    COLLOC_ACQ_FAIL = 0x8A2,
+    FAILED_TO_ACQUIRE_COLOCATED_HDR = 0x89F,
     /**
      * OTASP commit is in progress.
      */
-    OTASP_COMMIT_IN_PROG = 0x8A3,
+    OTASP_COMMIT_IN_PROGRESS = 0x8A0,
     /**
      * Device has no hybrid HDR service.
      */
-    NO_HYBR_HDR_SRV = 0x8A4,
+    NO_HYBRID_HDR_SERVICE = 0x8A1,
     /**
      * HDR module could not be obtained because of the RF locked.
      */
-    HDR_NO_LOCK_GRANTED = 0x8A5,
+    HDR_NO_LOCK_GRANTED = 0x8A2,
     /**
      * DBM or SMS is in progress.
      */
-    HOLD_OTHER_IN_PROG = 0x8A6,
+    DBM_OR_SMS_IN_PROGRESS = 0x8A3,
     /**
      * HDR module released the call due to fade.
      */
-    HDR_FADE = 0x8A7,
+    HDR_FADE = 0x8A4,
     /**
      * HDR system access failure.
      */
-    HDR_ACC_FAIL = 0x8A8,
+    HDR_ACCESS_FAILURE = 0x8A5,
     /**
      * P_rev supported by 1 base station is less than 6, which is not supported for a 1X data call.
      * The UE must be in the footprint of BS which has p_rev >= 6 to support this SO33 call.
      */
-    UNSUPPORTED_1X_PREV = 0x8A9,
+    UNSUPPORTED_1X_PREV = 0x8A6,
     /**
      * Client ended the data call.
      */
-    LOCAL_END = 0x8AA,
+    LOCAL_END = 0x8A7,
     /**
      * Device has no service.
      */
-    NO_SRV = 0x8AB,
+    NO_SERVICE = 0x8A8,
     /**
      * Device lost the system due to fade.
      */
-    FADE = 0x8AC,
+    FADE = 0x8A9,
     /**
      * Receiving a release from the base station with no reason.
      */
-    REL_NORMAL = 0x8AD,
+    NORMAL_RELEASE = 0x8AA,
     /**
      * Access attempt is already in progress.
      */
-    ACC_IN_PROG = 0x8AE,
-    /**
-     * Access failure.
-     */
-    ACC_FAIL = 0x8AF,
+    ACCESS_ATTEMPT_ALREADY_IN_PROGRESS = 0x8AB,
     /**
      * Device is in the process of redirecting or handing off to a different target system.
      */
-    REDIR_OR_HANDOFF = 0x8B0,
+    REDIRECTION_OR_HANDOFF_IN_PROGRESS = 0x8AC,
     /**
      * Device is operating in Emergency mode.
      */
-    EMERGENCY_MODE = 0x8B1,
+    EMERGENCY_MODE = 0x8AD,
     /**
      * Device is in use (e.g., voice call).
      */
-    PHONE_IN_USE = 0x8B2,
+    PHONE_IN_USE = 0x8AE,
     /**
-     * Device operational mode is different from the mode requested in the traffic channel bring up
+     * Device operational mode is different from the mode requested in the traffic channel bring up.
      */
-    INVALID_MODE = 0x8B3,
+    INVALID_MODE = 0x8AF,
     /**
      * SIM was marked by the network as invalid for the circuit and/or packet service domain.
      */
-    INVALID_SIM_STATE = 0x8B4,
+    INVALID_SIM_STATE = 0x8B0,
     /**
      * There is no co-located HDR.
      */
-    NO_COLLOC_HDR = 0x8B5,
+    NO_COLLOCATED_HDR = 0x8B1,
     /**
      * UE is entering power save mode.
      */
-    EMM_DETACHED_PSM = 0x8B6,
+    UE_IS_ENTERING_POWERSAVE_MODE = 0x8B2,
     /**
      * Dual switch from single standby to dual standby is in progress.
      */
-    DUAL_SWITCH = 0x8B7,
+    DUAL_SWITCH = 0x8B3,
     /**
-     * Data call bring up fails in the PPP setup due to a timeout.
-     * (e.g., an LCP conf ack was not received from the network)
+     * Data call bring up fails in the PPP setup due to a timeout. (e.g., an LCP conf ack was not
+     * received from the network)
      */
-    PPP_TIMEOUT = 0x8B8,
+    PPP_TIMEOUT = 0x8B4,
     /**
      * Data call bring up fails in the PPP setup due to an authorization failure.
      * (e.g., authorization is required, but not negotiated with the network during an LCP phase)
      */
-    PPP_AUTH_FAILURE = 0x8B9,
+    PPP_AUTH_FAILURE = 0x8B5,
     /**
      * Data call bring up fails in the PPP setup due to an option mismatch.
      */
-    PPP_OPTION_MISMATCH = 0x8BA,
+    PPP_OPTION_MISMATCH = 0x8B6,
     /**
      * Data call bring up fails in the PPP setup due to a PAP failure.
      */
-    PPP_PAP_FAILURE = 0x8BB,
+    PPP_PAP_FAILURE = 0x8B7,
     /**
      * Data call bring up fails in the PPP setup due to a CHAP failure.
      */
-    PPP_CHAP_FAILURE = 0x8BC,
+    PPP_CHAP_FAILURE = 0x8B8,
     /**
      * Data call bring up fails in the PPP setup because the PPP is in the process of cleaning the
      * previous PPP session.
      */
-    PPP_ERR_CLOSE_IN_PROGRESS = 0x8BD,
+    PPP_CLOSE_IN_PROGRESS = 0x8B9,
     /**
      * IPv6 interface bring up fails because the network provided only the IPv4 address for the
      * upcoming PDN permanent client can reattempt a IPv6 call bring up after the IPv4 interface is
      * also brought down. However, there is no guarantee that the network will provide a IPv6
      * address.
      */
-    EHRPD_SUBS_LIMITED_TO_V4 = 0x8BE,
+    LIMITED_TO_IPV4 = 0x8BA,
     /**
      * IPv4 interface bring up fails because the network provided only the IPv6 address for the
      * upcoming PDN permanent client can reattempt a IPv4 call bring up after the IPv6 interface is
      * also brought down. However there is no guarantee that the network will provide a IPv4
      * address.
      */
-    EHRPD_SUBS_LIMITED_TO_V6 = 0x8BF,
+    LIMITED_TO_IPV6 = 0x8BB,
     /**
      * Data call bring up fails in the VSNCP phase due to a VSNCP timeout error.
      */
-    EHRPD_VSNCP_TIMEOUT = 0x8C0,
+    VSNCP_TIMEOUT = 0x8BC,
     /**
-     * Data call bring up fails in the VSNCP phase due to a general error
+     * Data call bring up fails in the VSNCP phase due to a general error. It's used when there is
+     * no other specific error code available to report the failure.
      */
-    EHRPD_VSNCP_GEN_ERROR = 0x8C1,
+    VSNCP_GEN_ERROR = 0x8BD,
     /**
      * Data call bring up fails in the VSNCP phase due to a network rejection of the VSNCP
      * configuration request because the requested APN is unauthorized.
      */
-    EHRPD_VSNCP_UNAUTH_APN = 0x8C2,
+    VSNCP_APN_UNATHORIZED = 0x8BE,
     /**
      * Data call bring up fails in the VSNCP phase due to a network rejection of the VSNCP
      * configuration request because the PDN limit has been exceeded.
      */
-    EHRPD_VSNCP_PDN_LIMIT_EXCEED = 0x8C3,
+    VSNCP_PDN_LIMIT_EXCEEDED = 0x8BF,
     /**
-     * Data call bring up fails in the VSNCP phase because the network rejected the VSNCP
-     * configuration request due to no PDN gateway.
+     * Data call bring up fails in the VSNCP phase due to the network rejected the VSNCP
+     * configuration request due to no PDN gateway address.
      */
-    EHRPD_VSNCP_NO_PDN_GW = 0x8C4,
+    VSNCP_NO_PDN_GATEWAY_ADDRESS = 0x8C0,
     /**
      * Data call bring up fails in the VSNCP phase due to a network rejection of the VSNCP
      * configuration request because the PDN gateway is unreachable.
      */
-    EHRPD_VSNCP_PDN_GW_UNREACH = 0x8C5,
+    VSNCP_PDN_GATEWAY_UNREACHABLE = 0x8C1,
     /**
      * Data call bring up fails in the VSNCP phase due to a network rejection of the VSNCP
      * configuration request due to a PDN gateway reject.
      */
-    EHRPD_VSNCP_PDN_GW_REJ = 0x8C6,
+    VSNCP_PDN_GATEWAY_REJECT = 0x8C2,
     /**
      * Data call bring up fails in the VSNCP phase due to a network rejection of the VSNCP
      * configuration request with the reason of insufficient parameter.
      */
-    EHRPD_VSNCP_INSUFF_PARAM = 0x8C7,
+    VSNCP_INSUFFICIENT_PARAMETERS = 0x8C3,
     /**
      * Data call bring up fails in the VSNCP phase due to a network rejection of the VSNCP
      * configuration request with the reason of resource unavailable.
      */
-    EHRPD_VSNCP_RESOURCE_UNAVAIL = 0x8C8,
+    VSNCP_RESOURCE_UNAVAILABLE = 0x8C4,
     /**
      * Data call bring up fails in the VSNCP phase due to a network rejection of the VSNCP
-     * configuration request with the reason of admin prohibited.
+     * configuration request with the reason of administratively prohibited at the HSGW.
      */
-    EHRPD_VSNCP_ADMIN_PROHIBIT = 0x8C9,
+    VSNCP_ADMINISTRATIVELY_PROHIBITED = 0x8C5,
     /**
      * Data call bring up fails in the VSNCP phase due to a network rejection of PDN ID in use, or
      * all existing PDNs are brought down with this end reason because one of the PDN bring up was
      * rejected by the network with the reason of PDN ID in use.
      */
-    EHRPD_VSNCP_PDN_ID_IN_USE = 0x8CA,
+    VSNCP_PDN_ID_IN_USE = 0x8C6,
     /**
      * Data call bring up fails in the VSNCP phase due to a network rejection of the VSNCP
      * configuration request for the reason of subscriber limitation.
      */
-    EHRPD_VSNCP_SUBSCR_LIMITATION = 0x8CB,
+    VSNCP_SUBSCRIBER_LIMITATION = 0x8C7,
     /**
      * Data call bring up fails in the VSNCP phase due to a network rejection of the VSNCP
      * configuration request because the PDN exists for this APN.
      */
-    EHRPD_VSNCP_PDN_EXISTS_FOR_THIS_APN = 0x8CC,
+    VSNCP_PDN_EXISTS_FOR_THIS_APN = 0x8C8,
     /**
      * Data call bring up fails in the VSNCP phase due to a network rejection of the VSNCP
      * configuration request with reconnect to this PDN not allowed, or an active data call is
      * terminated by the network because reconnection to this PDN is not allowed. Upon receiving
-     * this error code from the network, the modem infinitely throttles the PDN until the next
-     * power cycle.
+     * this error code from the network, the modem infinitely throttles the PDN until the next power
+     * cycle.
      */
-    EHRPD_VSNCP_RECONNECT_NOT_ALLOWED = 0x8CD,
+    VSNCP_RECONNECT_NOT_ALLOWED = 0x8C9,
     /**
      * Device failure to obtain the prefix from the network.
      */
-    IPV6_PREFIX_UNAVAILABLE = 0x8CE,
+    IPV6_PREFIX_UNAVAILABLE = 0x8CA,
     /**
      * System preference change back to SRAT during handoff
      */
-    HANDOFF_PREF_SYS_BACK_TO_SRAT = 0x8CF,
+    HANDOFF_PREFERENCE_CHANGED = 0x8CB,
 };
 
 /**
@@ -1390,13 +1397,9 @@
      */
     NON_IP = 4,
     /**
-     * Ethernet protocol
-     */
-    ETHERNET = 5,
-    /**
      * Transfer of Unstructured data to the Data Network via N6
      */
-    UNSTRUCTURED = 6,
+    UNSTRUCTURED = 5,
 };
 
 safe_union RadioFrequencyInfo {
diff --git a/sensors/2.0/vts/functional/VtsHalSensorsV2_0TargetTest.cpp b/sensors/2.0/vts/functional/VtsHalSensorsV2_0TargetTest.cpp
index ac020ad..4a1f8f1 100644
--- a/sensors/2.0/vts/functional/VtsHalSensorsV2_0TargetTest.cpp
+++ b/sensors/2.0/vts/functional/VtsHalSensorsV2_0TargetTest.cpp
@@ -41,6 +41,8 @@
 using ::android::hardware::sensors::V1_0::SharedMemType;
 using ::android::hardware::sensors::V1_0::Vec3;
 
+constexpr size_t kEventSize = static_cast<size_t>(SensorsEventFormatOffset::TOTAL_LENGTH);
+
 class EventCallback : public IEventCallback {
    public:
     void reset() {
@@ -170,6 +172,7 @@
     std::vector<SensorInfo> getOneShotSensors();
     std::vector<SensorInfo> getInjectEventSensors();
     int32_t getInvalidSensorHandle();
+    bool getDirectChannelSensor(SensorInfo* sensor, SharedMemType* memType, RateLevel* rate);
     void verifyDirectChannel(SharedMemType memType);
     void verifyRegisterDirectChannel(const SensorInfo& sensor, SharedMemType memType,
                                      std::shared_ptr<SensorsTestSharedMemory> mem,
@@ -632,6 +635,32 @@
     activateAllSensors(false);
 }
 
+TEST_F(SensorsHidlTest, CleanupConnectionsOnInitialize) {
+    activateAllSensors(true);
+
+    // Verify that events are received
+    constexpr useconds_t kCollectionTimeoutUs = 1000 * 1000;  // 1s
+    constexpr int32_t kNumEvents = 1;
+    ASSERT_GE(collectEvents(kCollectionTimeoutUs, kNumEvents, getEnvironment()).size(), kNumEvents);
+
+    // Clear the active sensor handles so they are not disabled during TearDown
+    auto handles = mSensorHandles;
+    mSensorHandles.clear();
+    getEnvironment()->TearDown();
+    getEnvironment()->SetUp();
+
+    // Verify no events are received until sensors are re-activated
+    ASSERT_EQ(collectEvents(kCollectionTimeoutUs, kNumEvents, getEnvironment()).size(), 0);
+    activateAllSensors(true);
+    ASSERT_GE(collectEvents(kCollectionTimeoutUs, kNumEvents, getEnvironment()).size(), kNumEvents);
+
+    // Disable sensors
+    activateAllSensors(false);
+
+    // Restore active sensors prior to clearing the environment
+    mSensorHandles = handles;
+}
+
 void SensorsHidlTest::runSingleFlushTest(const std::vector<SensorInfo>& sensors,
                                          bool activateSensor, int32_t expectedFlushCount,
                                          Result expectedResponse) {
@@ -893,7 +922,6 @@
 }
 
 void SensorsHidlTest::verifyDirectChannel(SharedMemType memType) {
-    constexpr size_t kEventSize = static_cast<size_t>(SensorsEventFormatOffset::TOTAL_LENGTH);
     constexpr size_t kNumEvents = 1;
     constexpr size_t kMemSize = kNumEvents * kEventSize;
 
@@ -917,30 +945,96 @@
     verifyDirectChannel(SharedMemType::GRALLOC);
 }
 
-TEST_F(SensorsHidlTest, ConfigureDirectChannelWithInvalidHandle) {
-    for (const SensorInfo& sensor : getSensorsList()) {
-        if (isDirectChannelTypeSupported(sensor, SharedMemType::ASHMEM) ||
-            isDirectChannelTypeSupported(sensor, SharedMemType::GRALLOC)) {
-            // Find a supported rate level
-            RateLevel rate = RateLevel::STOP;
-            if (isDirectReportRateSupported(sensor, RateLevel::NORMAL)) {
-                rate = RateLevel::NORMAL;
-            } else if (isDirectReportRateSupported(sensor, RateLevel::FAST)) {
-                rate = RateLevel::FAST;
-            } else if (isDirectReportRateSupported(sensor, RateLevel::VERY_FAST)) {
-                rate = RateLevel::VERY_FAST;
-            }
-
-            // Ensure that at least one rate level is supported
-            ASSERT_NE(rate, RateLevel::STOP);
-
-            // Verify that an invalid channel handle produces a BAD_VALUE result
-            configDirectReport(sensor.sensorHandle, -1, rate,
-                               [](Result result, int32_t /* reportToken */) {
-                                   ASSERT_EQ(result, Result::BAD_VALUE);
-                               });
+bool SensorsHidlTest::getDirectChannelSensor(SensorInfo* sensor, SharedMemType* memType,
+                                             RateLevel* rate) {
+    bool found = false;
+    for (const SensorInfo& curSensor : getSensorsList()) {
+        if (isDirectChannelTypeSupported(curSensor, SharedMemType::ASHMEM)) {
+            *memType = SharedMemType::ASHMEM;
+            *sensor = curSensor;
+            found = true;
+            break;
+        } else if (isDirectChannelTypeSupported(curSensor, SharedMemType::GRALLOC)) {
+            *memType = SharedMemType::GRALLOC;
+            *sensor = curSensor;
+            found = true;
+            break;
         }
     }
+
+    if (found) {
+        // Find a supported rate level
+        constexpr int kNumRateLevels = 3;
+        RateLevel rates[kNumRateLevels] = {RateLevel::NORMAL, RateLevel::FAST,
+                                           RateLevel::VERY_FAST};
+        *rate = RateLevel::STOP;
+        for (int i = 0; i < kNumRateLevels; i++) {
+            if (isDirectReportRateSupported(*sensor, rates[i])) {
+                *rate = rates[i];
+            }
+        }
+
+        // At least one rate level must be supported
+        EXPECT_NE(*rate, RateLevel::STOP);
+    }
+    return found;
+}
+
+TEST_F(SensorsHidlTest, ConfigureDirectChannelWithInvalidHandle) {
+    SensorInfo sensor;
+    SharedMemType memType;
+    RateLevel rate;
+    if (!getDirectChannelSensor(&sensor, &memType, &rate)) {
+        return;
+    }
+
+    // Verify that an invalid channel handle produces a BAD_VALUE result
+    configDirectReport(sensor.sensorHandle, -1, rate, [](Result result, int32_t /* reportToken */) {
+        ASSERT_EQ(result, Result::BAD_VALUE);
+    });
+}
+
+TEST_F(SensorsHidlTest, CleanupDirectConnectionOnInitialize) {
+    constexpr size_t kNumEvents = 1;
+    constexpr size_t kMemSize = kNumEvents * kEventSize;
+
+    SensorInfo sensor;
+    SharedMemType memType;
+    RateLevel rate;
+
+    if (!getDirectChannelSensor(&sensor, &memType, &rate)) {
+        return;
+    }
+
+    std::shared_ptr<SensorsTestSharedMemory> mem(
+        SensorsTestSharedMemory::create(memType, kMemSize));
+    ASSERT_NE(mem, nullptr);
+
+    int32_t directChannelHandle = 0;
+    registerDirectChannel(mem->getSharedMemInfo(), [&](Result result, int32_t channelHandle) {
+        ASSERT_EQ(result, Result::OK);
+        directChannelHandle = channelHandle;
+    });
+
+    // Configure the channel and expect success
+    configDirectReport(
+        sensor.sensorHandle, directChannelHandle, rate,
+        [](Result result, int32_t /* reportToken */) { ASSERT_EQ(result, Result::OK); });
+
+    // Call initialize() via the environment setup to cause the HAL to re-initialize
+    // Clear the active direct connections so they are not stopped during TearDown
+    auto handles = mDirectChannelHandles;
+    mDirectChannelHandles.clear();
+    getEnvironment()->TearDown();
+    getEnvironment()->SetUp();
+
+    // Attempt to configure the direct channel and expect it to fail
+    configDirectReport(
+        sensor.sensorHandle, directChannelHandle, rate,
+        [](Result result, int32_t /* reportToken */) { ASSERT_EQ(result, Result::BAD_VALUE); });
+
+    // Restore original handles, though they should already be deactivated
+    mDirectChannelHandles = handles;
 }
 
 int main(int argc, char** argv) {
diff --git a/wifi/1.3/IWifiChip.hal b/wifi/1.3/IWifiChip.hal
index be00ee5..fc6dbac 100644
--- a/wifi/1.3/IWifiChip.hal
+++ b/wifi/1.3/IWifiChip.hal
@@ -31,7 +31,12 @@
         /**
          * Set Latency Mode.
          */
-         SET_LATENCY_MODE = 1 << 12
+        SET_LATENCY_MODE = 1 << 12,
+
+        /**
+         * Support P2P MAC randomization
+         */
+        P2P_RAND_MAC = 1 << 13
     };
 
     /**
diff --git a/wifi/1.3/default/hidl_struct_util.cpp b/wifi/1.3/default/hidl_struct_util.cpp
index a102def..49c1477 100644
--- a/wifi/1.3/default/hidl_struct_util.cpp
+++ b/wifi/1.3/default/hidl_struct_util.cpp
@@ -83,6 +83,8 @@
             return HidlChipCaps::D2AP_RTT;
         case WIFI_FEATURE_SET_LATENCY_MODE:
             return HidlChipCaps::SET_LATENCY_MODE;
+        case WIFI_FEATURE_P2P_RAND_MAC:
+            return HidlChipCaps::P2P_RAND_MAC;
     };
     CHECK(false) << "Unknown legacy feature: " << feature;
     return {};
@@ -141,14 +143,18 @@
                 convertLegacyLoggerFeatureToHidlChipCapability(feature);
         }
     }
-    for (const auto feature :
-         {WIFI_FEATURE_SET_TX_POWER_LIMIT, WIFI_FEATURE_USE_BODY_HEAD_SAR,
-          WIFI_FEATURE_D2D_RTT, WIFI_FEATURE_D2AP_RTT,
-          WIFI_FEATURE_SET_LATENCY_MODE}) {
+    std::vector<uint32_t> features = {WIFI_FEATURE_SET_TX_POWER_LIMIT,
+                                      WIFI_FEATURE_USE_BODY_HEAD_SAR,
+                                      WIFI_FEATURE_D2D_RTT,
+                                      WIFI_FEATURE_D2AP_RTT,
+                                      WIFI_FEATURE_SET_LATENCY_MODE,
+                                      WIFI_FEATURE_P2P_RAND_MAC};
+    for (const auto feature : features) {
         if (feature & legacy_feature_set) {
             *hidl_caps |= convertLegacyFeatureToHidlChipCapability(feature);
         }
     }
+
     // There are no flags for these 3 in the legacy feature set. Adding them to
     // the set because all the current devices support it.
     *hidl_caps |= HidlChipCaps::DEBUG_RING_BUFFER_VENDOR_DATA;
diff --git a/wifi/supplicant/1.2/ISupplicantP2pIface.hal b/wifi/supplicant/1.2/ISupplicantP2pIface.hal
index 7f6970f..d58f46b 100644
--- a/wifi/supplicant/1.2/ISupplicantP2pIface.hal
+++ b/wifi/supplicant/1.2/ISupplicantP2pIface.hal
@@ -68,4 +68,16 @@
     addGroup_1_2(Ssid ssid, string pskPassphrase, bool persistent,
                  uint32_t freq, MacAddress peerAddress, bool joinExistingGroup)
         generates (SupplicantStatus status);
+
+    /**
+     * Set MAC randomization enabled/disabled.
+     *
+     * @param enable true to enable, false to disable.
+     * @return status Status of the operation.
+     *         Possible status codes:
+     *         |SupplicantStatusCode.SUCCESS|,
+     *         |SupplicantStatusCode.FAILURE_UNKNOWN|,
+     *         |SupplicantStatusCode.FAILURE_IFACE_INVALID|
+     */
+    setMacRandomization(bool enable) generates (SupplicantStatus status);
 };
diff --git a/wifi/supplicant/1.2/vts/functional/supplicant_p2p_iface_hidl_test.cpp b/wifi/supplicant/1.2/vts/functional/supplicant_p2p_iface_hidl_test.cpp
index 46b4087..9249045 100644
--- a/wifi/supplicant/1.2/vts/functional/supplicant_p2p_iface_hidl_test.cpp
+++ b/wifi/supplicant/1.2/vts/functional/supplicant_p2p_iface_hidl_test.cpp
@@ -126,3 +126,26 @@
             EXPECT_EQ(SupplicantStatusCode::FAILURE_UNKNOWN, status.code);
         });
 }
+
+/*
+ * Verify that setMacRandomization successes.
+ */
+TEST_F(SupplicantP2pIfaceHidlTest, EnableMacRandomization) {
+    p2p_iface_->setMacRandomization(true, [](const SupplicantStatus& status) {
+        EXPECT_EQ(SupplicantStatusCode::SUCCESS, status.code);
+    });
+
+    // enable twice
+    p2p_iface_->setMacRandomization(true, [](const SupplicantStatus& status) {
+        EXPECT_EQ(SupplicantStatusCode::SUCCESS, status.code);
+    });
+
+    p2p_iface_->setMacRandomization(false, [](const SupplicantStatus& status) {
+        EXPECT_EQ(SupplicantStatusCode::SUCCESS, status.code);
+    });
+
+    // disable twice
+    p2p_iface_->setMacRandomization(false, [](const SupplicantStatus& status) {
+        EXPECT_EQ(SupplicantStatusCode::SUCCESS, status.code);
+    });
+}