Fixes: 131298070 Test: Gerrit verification that tests are running Change-Id: I3eab9721f1f4e74d70b718ca8f54943278ef6ee1