Bug: 288815100 Test: compile and collect bugreport Change-Id: I8b74ec265d3ccac2ff2bbe3e52e5a47ee2b0704a