Merge "Avoid trigger Battery test when there is no battery" into pie-cts-dev