Merge 26cb2306 on remote branch

Change-Id: I205a8ac048db253ab8ae5990b2d7c9a901078b8e

manifest.xml

@@ -300,7 +300,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     <hal format="hidl">
         <name>vendor.qti.hardware.wifi.hostapd</name>
         <transport>hwbinder</transport>
-        <version>1.1</version>
+        <version>1.2</version>
         <interface>
             <name>IHostapdVendor</name>
             <instance>default</instance>
@@ -524,7 +524,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    <hal format="hidl">
        <name>com.qualcomm.qti.uceservice</name>
        <transport>hwbinder</transport>
-       <version>2.1</version>
+       <version>2.2</version>
        <interface>
          <name>IUceService</name>
          <instance>com.qualcomm.qti.uceservice</instance>
@@ -550,7 +550,16 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
          <instance>qti.ims.connectionmanagerservice</instance>
        </interface>
    </hal>
-       <hal format="hidl">
+   <hal format="hidl">
+       <name>vendor.qti.ims.factory</name>
+       <transport>hwbinder</transport>
+       <version>1.0</version>
+       <interface>
+         <name>IImsFactory</name>
+         <instance>default</instance>
+       </interface>
+   </hal>
+   <hal format="hidl">
         <name>vendor.qti.data.factory</name>
         <transport>hwbinder</transport>
         <version>2.1</version>