am bca73335: am 2aea83a4: (-s ours) keep history after reset to jb-ub-latinimegoogle-bayo

* commit 'bca73335a8cc6c32b138e5e3b56d7378cb16aa36':