Fix build for nyc-dr1-dev
am: 4643ab6f73

Change-Id: I19d1bdfeff2f4d74c7aa513e9b6fff4283ac768b