Merge branch 'hotfix/4.3.2' into develop

Conflicts:
	WordPress/build.gradle
	libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerMixpanel.java
	libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java

Author: tonyr59h

WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java

@@ -69,6 +69,8 @@ public enum Stat {
         EDITOR_TAPPED_MORE,
         EDITOR_TAPPED_STRIKETHROUGH,
         EDITOR_TAPPED_UNDERLINE,
+        ME_ACCESSED,
+        MY_SITE_ACCESSED,
         NOTIFICATIONS_ACCESSED,
         NOTIFICATIONS_OPENED_NOTIFICATION_DETAILS,
         NOTIFICATION_REPLIED_TO,
@@ -84,7 +86,7 @@ public enum Stat {
         OPENED_VIEW_SITE,
         OPENED_VIEW_ADMIN,
         OPENED_MEDIA_LIBRARY,
-        OPENED_SETTINGS,
+        OPENED_BLOG_SETTINGS,
         CREATED_ACCOUNT,
         ACCOUNT_LOGOUT,
         SHARED_ITEM,

WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerMixpanel.java

@@ -17,7 +17,6 @@
 
 import java.util.EnumMap;
 import java.util.Iterator;
-import java.util.Locale;
 import java.util.Map;
 
 public class AnalyticsTrackerMixpanel implements AnalyticsTracker.Tracker {
@@ -525,7 +524,7 @@ private AnalyticsTrackerMixpanelInstructionsForStat instructionsForStat(
                 instructions = AnalyticsTrackerMixpanelInstructionsForStat.
                         mixpanelInstructionsForEventName("Site Menu - Opened Media Library");
                 break;
-            case OPENED_SETTINGS:
+            case OPENED_BLOG_SETTINGS:
                 instructions = AnalyticsTrackerMixpanelInstructionsForStat.
                         mixpanelInstructionsForEventName("Site Menu - Opened Settings");
                 break;
@@ -686,6 +685,16 @@ private AnalyticsTrackerMixpanelInstructionsForStat instructionsForStat(
                 instructions = AnalyticsTrackerMixpanelInstructionsForStat.
                         mixpanelInstructionsForEventName("Notification Settings - Updated");
                 break;
+            case ME_ACCESSED:
+                instructions = AnalyticsTrackerMixpanelInstructionsForStat.
+                        mixpanelInstructionsForEventName("Me Tab - Accessed");
+                instructions.setSuperPropertyAndPeoplePropertyToIncrement("number_of_times_accessed_me_tab");
+                break;
+            case MY_SITE_ACCESSED:
+                instructions = AnalyticsTrackerMixpanelInstructionsForStat.
+                        mixpanelInstructionsForEventName("My Site - Accessed");
+                instructions.setSuperPropertyAndPeoplePropertyToIncrement("number_of_times_accessed_my_site");
+                break;
             default:
                 instructions = null;
                 break;

WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java

@@ -240,7 +240,7 @@ public void track(AnalyticsTracker.Stat stat, Map<String, ?> properties) {
                 eventName = "site_menu_opened";
                 predefinedEventProperties.put("menu_item", "media_library");
                 break;
-            case OPENED_SETTINGS:
+            case OPENED_BLOG_SETTINGS:
                 eventName = "site_menu_opened";
                 predefinedEventProperties.put("menu_item", "settings");
                 break;
@@ -347,6 +347,12 @@ public void track(AnalyticsTracker.Stat stat, Map<String, ?> properties) {
             case NOTIFICATION_SETTINGS_UPDATED:
                 eventName = "notification_settings_updated";
                 break;
+            case ME_ACCESSED:
+                eventName = "me_tab_accessed";
+                break;
+            case MY_SITE_ACCESSED:
+                eventName = "my_site_tab_accessed";
+                break;
             default:
                 eventName = null;
                 break;