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

Change-Id: Ica0f1dcdb796f53665462efb1db2ef3183768254