Merge "Increase the timeout of waiting for commit completion." into rvc-dev am: b98b382c21 am: 4f6d5ddff6 am: 7a2fb7d4ef am: 1a7c1e103e am: 8c34339ee7

Change-Id: If63ffbe3fc81f739e77be0c8837fa12e4a9b98a8