Fixes: 151184696 Test: build Change-Id: Ie1886d7cd1bac22da41c942b6507b24bc4238c10 (cherry picked from commit 1b78c532)