manual cherry-pick 4685133cb91ebae32696905ee4c48a5e29e80f30

Change-Id: If64a3cf5096ff9fd8b32f953a729251b940682c9
2 files changed