Bug: 139308734 Test: make; acloud create; Change-Id: I4e821ea24eb109cca54087ea6163d42b6e8f5639 (cherry picked from commit 551d3282)