Catch tests up with local changes to this module.

Change-Id: I83ccd13788bf54a2cd95d039621b7845020af4e4
Merge "Catch tests up with local changes to this module." into production