Bug: 67663308 Test: Build on master and PDK branch Change-Id: I101452230376c4c509004cf6d03070ce85620e89