Backport note: Fixed the release version used in unit tests. Change-Id: I66bbc9c84a309da451748734f23f43d4f4277cc1 (cherry picked from commit3ecddc5926) (cherry picked from commit248294304a) (cherry picked from commite44d8698db) (cherry picked from commitf5dde77810)