Switch to stable/6.0 branch

Change-Id: Icc0045828e4140a38ea9fceaff5fb4aaa0f7b03b