Merge "Update the max height/width attribute of the TwoTargetPreference icon."...
Merge "Update the max height/width attribute of the TwoTargetPreference icon." into oc-dr1-dev am: 9f675cee
am: db0ec7d6
Change-Id: I7ef8fb885ee70d05b9afee829f8278f4236c9eb0