Merge "Null check before writing RemoteAnimationTarget proto"