Replace native range rectangle hacks with RangeFix library

Change-Id: I7f6cb6cbdd2b4385fb8ca95c03795cbdd929a860
Merge "Replace native range rectangle hacks with RangeFix library"