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

Change-Id: I70280eb85b9430c23f6b2681375cbcfa9da2dd38