The range type have been merged in 3.18 and not 3.16 Change-Id: I34d13696a9cb349120d58a5ea036866dcf63db15