Update opt-in/-out

Change-Id: Ib5894f511c857560431eedf44240ce868ff9102c