Merge "Migrate flicker to proto lite instead of nano"