Merge branch 'stable-2.16' * stable-2.16: Add custom stamp to add its-base revision to version number Change-Id: Ic4e9a92d2da276b6042d0b032880d455243a081f