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

Change-Id: Ifdec08542102cf4eba2aa9baf206272523b56894