Merge "Modify Comparator in ZonePicker" am: 3c03207f9f am: cd2e1c1535
am: 78d7e2a096

Change-Id: I9dff60079bf81e6c4c70200e8869fc77321f6b0c