BUG: 127353494 BUG: 128842306 Test: Local build and boot Change-Id: I50e1bdbcc1eb33a2bab919f4cbbbc8152345b2f7
mentioned in commit fe4010c4