- build broken due to increased binary sizes bug: 35719262 Test: build Change-Id: I2de7c9f93487660040683c887358de4a95cb35d0
