Merge branch 'stable-3.0' into stable-3.1 * stable-3.0: PushOne: Improve logging of lock failure Change-Id: Id73f36de2b7d3a86520b58c31725d36a22828d5f