BUG=b/29583530 Change-Id: Iafd05637eb65f4da54a9c857e79204a77646858a (cherry picked from commit c125f4a594815ad63b50e4b684ada4b44c545932)