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

Change-Id: Ib0da7ae4d45f57ef93bb93d9677668961a05c330