am ef9778ba: Merge "Fixed b/10512887." into klp-dev

* commit 'ef9778ba39d73f67970f674893d56e48407823fd':
  Fixed b/10512887.