Merge changes Ib01ed59d,I1e13aa8c

* changes:
  Porting cl/358130662
  Porting cl/356728731