Bug: 338890550 Bug: 338889494 Bug: 338890548 Test: make Change-Id: I53dafa8b11197d57ae684c42e3ea53732f2c4ef8