Fix failing tests

Change-Id: I58baf0e4c61796b53bd847cf4a223989e0e3ab8b
Merge "Fix failing tests"