Wait for device to charge between test cases am: 69f1b74d95
am: 2dc2a9c725

Change-Id: Idf4ff52bdca781f13a62c18c299060859dcf0768