DO NOT MERGE. may fix build on some version of gcc

Change-Id: Iff6d9ab3a7caf58f65fc3f60633a3bd577b7af25
1 file changed