Merge "Add test flags for battery tips." into pi-dev