Merge "Fix failing test." am: f925be987b
am: ff697ecf09

Change-Id: Ie5c33818fd602508df37c49057237c34a223b040