am b602943f: am 7d7f0f47: am 9b1ac269: (-s ours) am 1754824c: am c96ef952: Add documentation about hack in commit: f8ea750455 [DO NOT MERGE]

* commit 'b602943f0d39487a54b279109af0c40784469d5e':
  Add documentation about hack in commit: f8ea750455 [DO NOT MERGE]