Fix master build (cherry picked from commit 7845e44c0c) Change-Id: Ic99a5e868b5d42e7bf72ef5388e30f070b6655d8
7845e44c0c