[DO NOT MERGE] Fix build break am: df838a9fa6

Change-Id: I00390872574419439d5df77f48cd209b2bd34757