Merge changes I3d1d9502,I9f828fc0 into main

* changes:
  Remove mDataSource.flush() call
  Update the exhaust policy of ProtoLog