Change-Id: Ib42fe5ba57d5ef31a00b39945ac3bcacbb217cc8 Fixes: 35965642 Bug: 33550221 Test: compilation only