Merge "Revert "Fix broken unit test"" am: 27bd621bd4

Original change: undetermined

Change-Id: I60af5da0213f120d8914e3828c1f76847b4f7935