Merge "Remove warnings in Rect.h" am: 13996341b8 am: 671461ed45 am: ae59abc335
am: ccba308b34

Change-Id: I4ef66012ba9351f087cb139a027441e330529d04