Merge "CTS: reduce trigger level for battery saver to accommodate watch type devices." into pi-dev