Merge "versioner: add support for __VERSIONER_NO_GUARD." am: 3afa18104b
am: 7f5236ad4a

Change-Id: If205ebd8c69fea377a87c675181f87f86ab6351e