Merge changes I6af1fc7d,I0627d54a

* changes:
  Automated g4 rollback of changelist 167310802.
  Automated g4 rollback of changelist 167332236.