Merge "versioner: don't always hide future decls." am: 84e269d5af am: 73a4998c7d
am: 3ba973a7dd

Change-Id: Ic2ed50f5018a784e970a0d5b9ca4bea557988e87