Bug: 36515029 Test: the build still works. Change-Id: I39ae2c55b6b2b0d6547f75f4ef06e62e3e5f0b84 (cherry picked from commit 8e9ea907)