Merge branch 'stable-2.16' into stable-3.0 * stable-2.16: Upgrade JGit to 5.1.13.202002110435-r Change-Id: I8d75be40a111167309b004a98f6e0ac50bc09588