Bug: 180316277 Bug: 166430550 Test: build; flash; run Change-Id: I898324ee8c8339c95f72b7839bc68296830606e1