Change-Id: Idd8434e65691fc5d08f5427add6aec1870b76619 Fixes: 74409057 Test: compiles, no functionality change