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

Change-Id: I32b19e453af7a28c990a28b9726487415fe5be6f