Merge "Fix deprecated range_x calls." am: 87cafe8f33 am: d03b17c29a
am: 6e2c276c78

Change-Id: I6511ef9ccc352c43c7fa5924e1246449be7c3a0e