Bug: http://b/64459264
Test: builds, boots

(cherry picked from commit 934754db)

Change-Id: I476b4ef566a6eb3a0877b943fe1e7d8c26c9b305