Partial cherry pick from commit 693f997cc8 Change-Id: I0fe34541e3cf77fb6e6dbe689b7cf55cb78dbe05
693f997cc8