cherry-pick b0abf63202d4ca4520462c6dea66e850a99fdbef   (do not merge)

Change-Id: If8ded8eeea7b826ba2745b71b84a12fe067e0a9e
2 files changed