Fix range values

Change-Id: Idad77687b7e7544efdeddf62f48012435b6bfe9d
Merge "Fix range values"