Change-Id: I8ac1ede5b29f718aa145e18cf1cc057722b62f2b Fixes: 62810849 Test: Builds (cherry picked from commit 3c1820e0)