Merge "Fix broken unit test" am: 2f3150e97d

Original change: undetermined

Change-Id: Ic5c0726d5878a607606633804a311b8b3a81bd45