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

Change-Id: I435ef0c8c74fee7e843d4b8d4b013772c157187d