Bug: 78372687 Test: suceeded building and tested with taimen Change-Id: Iefa08beffd6377bdd5c0c49065471a59f79f79a1 (cherry picked from commit 376cc061)