Merge "Update the max height/width attribute of the TwoTargetPreference icon." into oc-dr1-dev am: 9f675cee28
am: db0ec7d60f

Change-Id: I7ef8fb885ee70d05b9afee829f8278f4236c9eb0