Merge branch 'stable-3.5' * stable-3.5: Don't depend on update ACL to create a branch Change-Id: I89696dd0a6d94619b6d3817842c19e60b461fdef