cherry pick "Fix build" a227db53f0cd30214c393b400436d1e0863396ef into master

Change-Id: I8db1a4b52d87e98efb07c6c1a2b22de7b7d5c297
1 file changed