Merge branch 'stable-2.16'

* stable-2.16:
  BUILD: Fix manifest version based on currently used bazlets
  BUILD: Remove innacurate SNAPSHOT suffix from manifest version

Change-Id: Ib4f233a83e09db1b9c3b219235bc0c2d556013bb