Bug: 173828358 Test: manual - check logs during testing Change-Id: Ic2ca8235e11e4bbc920e105033c4473c2ac665f3