[automerger] Adding check for min_width and min_height am: 84eba4863d am: 8429c5e659 am: 779c09b462 am: 3d56f0ca73 am: 5ce8567f43

Change-Id: Id588cfb3992c309a30188772880419112622597a