DO NOT MERGE

Manual merge part of https://android-git.corp.google.com/g/#change,42462
from master to mr2 for Adobe.

Fix http://b/issue?id=2475242
2 files changed