Merge branch 'master' into release/5.10.4

Author: hborisoff

AndroidSDKCore/src/main/java/com/leanplum/Leanplum.java

@@ -990,7 +990,7 @@ public void run() {
    * @param response The response containing content.
    */
   private static void applyContentInResponse(JSONObject response) {
-    Map<String, Object> values = JsonConverter.mapFromJsonOrDefault(
+    Map<String, Object> values = JsonConverter.mapFromJson(
         response.optJSONObject(Constants.Keys.VARS));
     Map<String, Object> messages = JsonConverter.mapFromJsonOrDefault(
         response.optJSONObject(Constants.Keys.MESSAGES));

AndroidSDKHms/consumer-proguard-rules.pro

@@ -5,3 +5,6 @@
 
 -keep class com.leanplum.** { *; }
 -dontwarn com.leanplum.**
+
+-keep class com.huawei.updatesdk.**{*;}
+-keep class com.huawei.hms.**{*;}