Merge branch 'stable-2.16' into stable-3.0 * stable-2.16: ReplicationFileBasedConfig: fix UnusedException error from ErrorProne Change-Id: Ia6142dea1802cb44b83a0b1abb657f4e8510fe8c