Fix test failures

Change-Id: If2c8af0ee3643ce7de556bd040fa129f12efca01
Merge "Fix test failures"