Merge branch 'stable-3.1' into stable-3.2 * stable-3.1: Always replicate changes regardless of the permissions Change-Id: I76212d958d876b55eb4067a2287c1af7ab5b1073