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

Change-Id: I97ec8751980a29d953f1a49b36cc78b66461e3e7