Merge "Should not use the absolute value when the value does not change." into pi-dev
am: 64307ea578

Change-Id: I8d4c27f386e4e952d2d32f627ea3818d8f50334e