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

Change-Id: I55005e7f8f64d8b3b11ea7f341ff8dcf534b3694