am 38f75b97: (-s ours) am 58300000: This was already deprecated, but not...
am 38f75b97: (-s ours) am 58300000: This was already deprecated, but not picked up by the tool DO NOT MERGE
Merge commit '38f75b97'
* commit '38f75b97':
This was already deprecated, but not picked up by the tool DO NOT MERGE